aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author宋文武 <iyzsong@gmail.com>2015-11-12 17:59:34 +0800
committer宋文武 <iyzsong@gmail.com>2015-11-13 12:56:50 +0800
commit9083788a294e5ccbbd9bd4b2bb2867dae7079018 (patch)
tree46e35c22af50845fda6ef22ffc4b99f543bc0336
parentf888502cfaa8c956817034fda5393894739307f1 (diff)
downloadgnu-guix-9083788a294e5ccbbd9bd4b2bb2867dae7079018.tar
gnu-guix-9083788a294e5ccbbd9bd4b2bb2867dae7079018.tar.gz
gnu: nix: Don't propagate Perl libraries.
* gnu/packages/package-management.scm (nix): Move perl-www-curl, perl-dbi and perl-dbd-sqlite from 'propagated-inputs' to 'inputs'. [arguments]: Add #:configure-flags.
-rw-r--r--gnu/packages/package-management.scm21
1 files changed, 17 insertions, 4 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 244cd49cf3..1c15196bf3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -251,16 +251,29 @@ the Nix package manager.")
;; XXX: Should we pass '--with-store-dir=/gnu/store'? But then we'd also
;; need '--localstatedir=/var'. But then! The thing would use /var/nix
;; instead of /var/guix. So in the end, we do nothing special.
+ (arguments
+ '(#:configure-flags
+ ;; Set the prefixes of Perl libraries to avoid propagation.
+ (let ((perl-libdir (lambda (p)
+ (string-append
+ (assoc-ref %build-inputs p)
+ "/lib/perl5/site_perl"))))
+ (list (string-append "--with-dbi="
+ (perl-libdir "perl-dbi"))
+ (string-append "--with-dbd-sqlite="
+ (perl-libdir "perl-dbd-sqlite"))
+ (string-append "--with-www-curl="
+ (perl-libdir "perl-www-curl"))))))
(native-inputs `(("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs `(("curl" ,curl)
("openssl" ,openssl)
("libgc" ,libgc)
("sqlite" ,sqlite)
- ("bzip2" ,bzip2)))
- (propagated-inputs `(("perl-www-curl" ,perl-www-curl)
- ("perl-dbi" ,perl-dbi)
- ("perl-dbd-sqlite" ,perl-dbd-sqlite)))
+ ("bzip2" ,bzip2)
+ ("perl-www-curl" ,perl-www-curl)
+ ("perl-dbi" ,perl-dbi)
+ ("perl-dbd-sqlite" ,perl-dbd-sqlite)))
(home-page "http://nixos.org/nix/")
(synopsis "The Nix package manager")
(description