diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-01-11 16:01:49 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-11 16:01:49 +0100 |
| commit | 01e354eb83299d00ddd6ba4beb73bac8130beeae (patch) | |
| tree | 03368edd8462d818334bec458cd04dc1de4750a1 /distro/packages/perl.scm | |
| parent | bfe384cc4c7e56ac1eceff8b5d92e916507436eb (diff) | |
| parent | 28e55604212c01884a77a4f5eb66294c4957c48a (diff) | |
| download | patches-01e354eb83299d00ddd6ba4beb73bac8130beeae.tar patches-01e354eb83299d00ddd6ba4beb73bac8130beeae.tar.gz | |
Merge branch 'core-updates'
Conflicts:
guix/build/union.scm
Diffstat (limited to 'distro/packages/perl.scm')
| -rw-r--r-- | distro/packages/perl.scm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/distro/packages/perl.scm b/distro/packages/perl.scm index 9f8de3d84f..b6357875b6 100644 --- a/distro/packages/perl.scm +++ b/distro/packages/perl.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,16 +46,14 @@ 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (libc (assoc-ref inputs "libc")) - (pwd (search-path (search-path-as-string->list - (getenv "PATH")) - "pwd"))) + (libc (assoc-ref inputs "libc"))) ;; Use the right path for `pwd'. (substitute* "dist/Cwd/Cwd.pm" - (("/bin/pwd") pwd)) + (("/bin/pwd") + (which "pwd"))) (zero? - (system* "/bin/sh" "./Configure" + (system* "./Configure" (string-append "-Dprefix=" out) (string-append "-Dman1dir=" out "/share/man/man1") (string-append "-Dman3dir=" out "/share/man/man3") |