diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
| commit | b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60 (patch) | |
| tree | 707c6a5e18474b410e39fa6892521c9f47518ccc /gnu/packages/xdisorg.scm | |
| parent | 97127431ee9133626fea62449706d729d80b73f6 (diff) | |
| parent | 5b63a8568b39c019970569773bace18fab17a157 (diff) | |
| download | guix-patches-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar guix-patches-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/xdisorg.scm')
| -rw-r--r-- | gnu/packages/xdisorg.scm | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a555a096a3..865a9083fa 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -182,14 +182,14 @@ X11 (yet).") (arguments '(#:tests? #f ; Test suite requires a lot of black magic #:phases - (alist-replace 'configure - (lambda* (#:key outputs #:allow-other-keys #:rest args) - (setenv "PREFIX" (assoc-ref outputs "out")) - (setenv "LDFLAGS" (string-append "-Wl,-rpath=" - (assoc-ref - %outputs "out") "/lib")) - (setenv "CC" "gcc")) - %standard-phases))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (setenv "PREFIX" (assoc-ref outputs "out")) + (setenv "LDFLAGS" + (string-append "-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib")) + (setenv "CC" "gcc")))))) (native-inputs `(("perl" ,perl))) ; for pod2man (inputs `(("libx11" ,libx11) ("libxext" ,libxext) @@ -514,21 +514,20 @@ include cursor in the resulting image.") (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target - #:phases (alist-delete - 'configure - (alist-replace - 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man1 (string-append out "/share/man/man1"))) - (mkdir-p bin) - (mkdir-p man1) - (zero? - (system* "make" "install" "install.man" - (string-append "BINDIR=" bin) - (string-append "MANDIR=" man1))))) - %standard-phases)))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man1 (string-append out "/share/man/man1"))) + (mkdir-p bin) + (mkdir-p man1) + (zero? + (system* "make" "install" "install.man" + (string-append "BINDIR=" bin) + (string-append "MANDIR=" man1))))))))) (inputs `(("libx11" ,libx11))) (home-page "http://ftp.x.org/contrib/utilities/") (synopsis "Hide idle mouse cursor") |