nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
ng0 2017-12-04 22:08:53 +00:00 committed by Kei Kebreau
parent 7b45392616
commit 3fb8041c0d
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/guile-wm.scm
View File

@ -53,14 +53,14 @@
#:configure-flags (list (string-append #:configure-flags (list (string-append
"--with-guile-site-dir=" "--with-guile-site-dir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0") "/share/guile/site/2.2")
(string-append (string-append
"--with-guile-site-ccache-dir=" "--with-guile-site-ccache-dir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0")))) "/share/guile/site/2.2"))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.2)
("xcb" ,xcb-proto))) ("xcb" ,xcb-proto)))
(home-page "https://github.com/mwitmer/guile-xcb") (home-page "https://github.com/mwitmer/guile-xcb")
(synopsis "XCB bindings for Guile") (synopsis "XCB bindings for Guile")
@ -92,17 +92,17 @@ dependencies.")
;; standard value. ;; standard value.
#:configure-flags (list (string-append "--datadir=" #:configure-flags (list (string-append "--datadir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0")) "/share/guile/site/2.2"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'set-go-directory (add-before 'configure 'set-go-directory
(lambda* (#:key outputs #:allow-other-keys) (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"))) (let ((out (assoc-ref outputs "out")))
(substitute* "module/Makefile.in" (substitute* "module/Makefile.in"
(("^wmdir = .*$") (("^wmdir = .*$")
(string-append "wmdir = " out (string-append "wmdir = " out
"/share/guile/site/2.0\n")))) "/share/guile/site/2.2\n"))))
#t)) #t))
(add-after 'install 'set-load-path (add-after 'install 'set-load-path
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -111,10 +111,10 @@ dependencies.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/bin/guile-wm")) (prog (string-append out "/bin/guile-wm"))
(mods (string-append (mods (string-append
out "/share/guile/site/2.0")) out "/share/guile/site/2.2"))
(xcb (string-append (xcb (string-append
(assoc-ref inputs "guile-xcb") (assoc-ref inputs "guile-xcb")
"/share/guile/site/2.0"))) "/share/guile/site/2.2")))
(wrap-program (wrap-program
prog prog
`("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb))
@ -140,7 +140,7 @@ dependencies.")
#t))))) #t)))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.2)
("guile-xcb" ,guile-xcb))) ("guile-xcb" ,guile-xcb)))
(home-page "https://github.com/mwitmer/guile-wm/releases") (home-page "https://github.com/mwitmer/guile-wm/releases")
(description (description