diff options
| author | ng0 <ng0@n0.is> | 2017-12-04 22:08:53 +0000 |
|---|---|---|
| committer | Kei Kebreau <kkebreau@posteo.net> | 2017-12-07 11:23:27 -0500 |
| commit | 3fb8041c0dbd26c18a611951af48ba34c951b59f (patch) | |
| tree | c3cf7cf8514659419addce4a00dde7b138d73ce7 | |
| parent | 7b45392616ad5842c278441cb8443febefccc6ae (diff) | |
| download | patches-3fb8041c0dbd26c18a611951af48ba34c951b59f.tar patches-3fb8041c0dbd26c18a611951af48ba34c951b59f.tar.gz | |
gnu: guile-wm and guile-xcb: Build with guile-2.2.
* gnu/packages/guile-wm.scm (guile-wm): Build with guile-2.2.
(arguments)[configure-flags]: Replace references of "2.0" with "2.2".
(inputs): Use guile-2.2.
* (guile-xcb): Build with guile-2.2.
(arguments)[configure-flags] Use Guile 2.2.
Signed-off-by: Kei Kebreau <kkebreau@posteo.net>
| -rw-r--r-- | gnu/packages/guile-wm.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 7f302668ab..918761259f 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -53,14 +53,14 @@ #:configure-flags (list (string-append "--with-guile-site-dir=" (assoc-ref %outputs "out") - "/share/guile/site/2.0") + "/share/guile/site/2.2") (string-append "--with-guile-site-ccache-dir=" (assoc-ref %outputs "out") - "/share/guile/site/2.0")))) + "/share/guile/site/2.2")))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.0) + (inputs `(("guile" ,guile-2.2) ("xcb" ,xcb-proto))) (home-page "https://github.com/mwitmer/guile-xcb") (synopsis "XCB bindings for Guile") @@ -92,17 +92,17 @@ dependencies.") ;; standard value. #:configure-flags (list (string-append "--datadir=" (assoc-ref %outputs "out") - "/share/guile/site/2.0")) + "/share/guile/site/2.2")) #:phases (modify-phases %standard-phases (add-before 'configure 'set-go-directory (lambda* (#:key outputs #:allow-other-keys) - ;; Install .go files to $out/share/guile/site/2.0. + ;; Install .go files to $out/share/guile/site/2.2. (let ((out (assoc-ref outputs "out"))) (substitute* "module/Makefile.in" (("^wmdir = .*$") (string-append "wmdir = " out - "/share/guile/site/2.0\n")))) + "/share/guile/site/2.2\n")))) #t)) (add-after 'install 'set-load-path (lambda* (#:key inputs outputs #:allow-other-keys) @@ -111,10 +111,10 @@ dependencies.") (let* ((out (assoc-ref outputs "out")) (prog (string-append out "/bin/guile-wm")) (mods (string-append - out "/share/guile/site/2.0")) + out "/share/guile/site/2.2")) (xcb (string-append (assoc-ref inputs "guile-xcb") - "/share/guile/site/2.0"))) + "/share/guile/site/2.2"))) (wrap-program prog `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) @@ -140,7 +140,7 @@ dependencies.") #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.0) + (inputs `(("guile" ,guile-2.2) ("guile-xcb" ,guile-xcb))) (home-page "https://github.com/mwitmer/guile-wm/releases") (description |