gnu: guile-xcb: Upgrade to 1.3.
* gnu/packages/guile-wm.scm (guile-xcb): Upgrade to 1.3. [arguments] Pass --with-guile-site-dir= instead of --datadir=, and pass --with-guile-site-ccache-dir=. Remove #:phases.master
parent
68276f164f
commit
9037ea2c12
|
@ -29,36 +29,26 @@
|
||||||
(define-public guile-xcb
|
(define-public guile-xcb
|
||||||
(package
|
(package
|
||||||
(name "guile-xcb")
|
(name "guile-xcb")
|
||||||
(version "1.2")
|
(version "1.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://www.markwitmer.com/dist/guile-xcb-"
|
(uri (string-append "http://www.markwitmer.com/dist/guile-xcb-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"009qrw46ay74z3mw8gz7jqvn90z9ilyhy00801w5vpyias02730y"))))
|
"04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments '(;; Parallel builds fail.
|
(arguments '(;; Parallel builds fail.
|
||||||
#:parallel-build? #f
|
#:parallel-build? #f
|
||||||
|
|
||||||
;; The '.scm' files go to $(datadir), so set that to the
|
|
||||||
;; standard value.
|
|
||||||
#:configure-flags (list (string-append
|
#:configure-flags (list (string-append
|
||||||
"--datadir="
|
"--with-guile-site-dir="
|
||||||
(assoc-ref %outputs "out")
|
(assoc-ref %outputs "out")
|
||||||
"/share/guile/site/2.0"))
|
"/share/guile/site/2.0")
|
||||||
#:phases (alist-cons-before
|
(string-append
|
||||||
'configure 'set-go-directory
|
"--with-guile-site-ccache-dir="
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(assoc-ref %outputs "out")
|
||||||
;; The makefile sets the .go directory to Guile's
|
"/share/guile/site/2.0"))))
|
||||||
;; own .go site directory, which is read-only.
|
|
||||||
;; Change it to point to $out/share/guile/site/2.0.
|
|
||||||
(let ((out (assoc-ref outputs "out")))
|
|
||||||
(substitute* "Makefile.in"
|
|
||||||
(("^godir = .*$")
|
|
||||||
(string-append "godir = " out
|
|
||||||
"/share/guile/site/2.0\n")))))
|
|
||||||
%standard-phases)))
|
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||||
(inputs `(("guile" ,guile-2.0)
|
(inputs `(("guile" ,guile-2.0)
|
||||||
("xcb" ,xcb-proto)))
|
("xcb" ,xcb-proto)))
|
||||||
|
|
Loading…
Reference in New Issue