diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-11-02 11:53:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-11-07 10:39:28 +0100 |
| commit | 0eeee298ef06d28ab428aaa0b7c12d0188f1d421 (patch) | |
| tree | edd48ac3930f6dc90782d8300ee5366c43631838 /pkgs/development/interpreters | |
| parent | 82dedd9cada0f7fd607b8bf9de30051510704a22 (diff) | |
| download | nixlib-0eeee298ef06d28ab428aaa0b7c12d0188f1d421.tar nixlib-0eeee298ef06d28ab428aaa0b7c12d0188f1d421.tar.gz nixlib-0eeee298ef06d28ab428aaa0b7c12d0188f1d421.tar.bz2 nixlib-0eeee298ef06d28ab428aaa0b7c12d0188f1d421.tar.lz nixlib-0eeee298ef06d28ab428aaa0b7c12d0188f1d421.tar.xz nixlib-0eeee298ef06d28ab428aaa0b7c12d0188f1d421.tar.zst nixlib-0eeee298ef06d28ab428aaa0b7c12d0188f1d421.zip | |
perl: avoid --no-cpp-precomp on darwin, (close #1160)
Taken from https://trac.macports.org/ticket/38913 vcunat renamed the patch Conflicts (trivial): pkgs/development/interpreters/perl/5.16/default.nix
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/perl/5.16/cpp-precomp.patch | 11 | ||||
| -rw-r--r-- | pkgs/development/interpreters/perl/5.16/default.nix | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch new file mode 100644 index 000000000000..231853fe51a6 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch @@ -0,0 +1,11 @@ +--- a/hints/darwin.sh 2013-05-08 11:13:45.000000000 -0600 ++++ b/hints/darwin.sh 2013-05-08 11:15:04.000000000 -0600 +@@ -129,7 +129,7 @@ + + # Avoid Apple's cpp precompiler, better for extensions + if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then +- cppflags="${cppflags} -no-cpp-precomp" ++ #cppflags="${cppflags} -no-cpp-precomp" + + # This is necessary because perl's build system doesn't + # apply cppflags to cc compile lines as it should. diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index 2113faee1640..a3ab0ef4b96f 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { [ # Do not look in /usr etc. for dependencies. ./no-sys-dirs.patch ] - ++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch; + ++ stdenv.lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; # Build a thread-safe Perl with a dynamic libperls.o. We need the # "installstyle" option to ensure that modules are put under |