diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-26 16:31:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-26 16:31:57 +0100 |
| commit | 4979ee04f07defb55dc448a5682913dc41935760 (patch) | |
| tree | 03d0a1ed2bd7c7d141d2af09ea01b66fa62e3d88 /gnu/packages/xorg.scm | |
| parent | 07fb21b231b8d86cc17beff64111759b972ffcac (diff) | |
| parent | eafee15b3ce3638058c43974244964dbd48ec15d (diff) | |
| download | guix-4979ee04f07defb55dc448a5682913dc41935760.tar guix-4979ee04f07defb55dc448a5682913dc41935760.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 51c8deb323..2e1eeda245 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1742,6 +1743,22 @@ tracking.") "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) + (arguments + `(#:phases (alist-cons-after + 'unpack 'fix-makefile-in + (lambda _ + (substitute* "Makefile.in" + ;; Install xorg-macros.pc in PREFIX/lib/pkgconfig, + ;; not PREFIX/share/pkgconfig. + (("\\$\\(datadir\\)/pkgconfig") "$(libdir)/pkgconfig"))) + (alist-cons-after + 'install 'post-install-cleanup + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion out + (delete-file "share/util-macros/INSTALL") + (rmdir "share/util-macros")))) + %standard-phases)))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") |