diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-13 00:04:07 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-13 00:04:07 +0100 |
| commit | 9037ea2c123eb5ad351fdc108bbd2ced7f1a81a8 (patch) | |
| tree | 150ca4c7c155e338173f4f09202826d8c18088d0 | |
| parent | 68276f164f7ec543ae11496ee52f8e05bc4fbfd9 (diff) | |
| download | guix-9037ea2c123eb5ad351fdc108bbd2ced7f1a81a8.tar guix-9037ea2c123eb5ad351fdc108bbd2ced7f1a81a8.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/guile-wm.scm | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index b05974c8ae..38c5959340 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -29,36 +29,26 @@ (define-public guile-xcb (package (name "guile-xcb") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) (uri (string-append "http://www.markwitmer.com/dist/guile-xcb-" version ".tar.gz")) (sha256 (base32 - "009qrw46ay74z3mw8gz7jqvn90z9ilyhy00801w5vpyias02730y")))) + "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149")))) (build-system gnu-build-system) (arguments '(;; Parallel builds fail. #:parallel-build? #f - ;; The '.scm' files go to $(datadir), so set that to the - ;; standard value. #:configure-flags (list (string-append - "--datadir=" + "--with-guile-site-dir=" (assoc-ref %outputs "out") - "/share/guile/site/2.0")) - #:phases (alist-cons-before - 'configure 'set-go-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; The makefile sets the .go directory to Guile's - ;; 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))) + "/share/guile/site/2.0") + (string-append + "--with-guile-site-ccache-dir=" + (assoc-ref %outputs "out") + "/share/guile/site/2.0")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.0) ("xcb" ,xcb-proto))) |