diff options
| author | Jude Taylor <me@jude.bio> | 2015-10-05 08:46:49 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-05 08:46:56 -0700 |
| commit | 0a32eab91e7a547325958da2581933a98095d50c (patch) | |
| tree | 9ac78b2de9a984bd96b4240ddd1269a56720d6eb /pkgs/development/interpreters/perl | |
| parent | 4e8da0747c88375c221bf1b0f060183a863c6851 (diff) | |
fix LLVM packages to work in darwin stdenv
Diffstat (limited to 'pkgs/development/interpreters/perl')
| -rw-r--r-- | pkgs/development/interpreters/perl/5.22/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/interpreters/perl/5.22/no-libutil.patch | 16 |
2 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix index e0be8610fb7bb..4b0f4364ea222 100644 --- a/pkgs/development/interpreters/perl/5.22/default.nix +++ b/pkgs/development/interpreters/perl/5.22/default.nix @@ -59,9 +59,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = '' + pwd="$(type -P pwd)" + substituteInPlace dist/PathTools/Cwd.pm \ + --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'" + ''; + preConfigure = '' - configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" ${optionalString stdenv.isArm '' diff --git a/pkgs/development/interpreters/perl/5.22/no-libutil.patch b/pkgs/development/interpreters/perl/5.22/no-libutil.patch index 68d44612bfe60..d6356a5243706 100644 --- a/pkgs/development/interpreters/perl/5.22/no-libutil.patch +++ b/pkgs/development/interpreters/perl/5.22/no-libutil.patch @@ -1,12 +1,14 @@ -diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure ---- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100 -@@ -1368,7 +1368,7 @@ +diff --git a/Configure b/Configure +index 0a405d3..1871298 100755 +--- a/Configure ++++ b/Configure +@@ -1455,7 +1455,7 @@ libswanted_uselargefiles='' : List of libraries we want. : If anyone needs extra -lxxx, put those in a hint file. - libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun" --libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" -+libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD" + libswanted="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld" +-libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" ++libswanted="$libswanted sun m crypt sec c cposix posix ucb bsd BSD" : We probably want to search /usr/shlib before most other libraries. : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` + |