From 71f191bdbaa8b1b9bf6f09c3aa294640b42a0f4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Aug 2013 12:06:39 +0200 Subject: [PATCH] perl: revert "re-enable the postPatch hook on Darwin" This reverts commit 1778200519a18ae00751ab3015d0e665373c32f6. Apparently, the sed -i syntax is different from what I thought, because now the build fails on Darwin, saying: sed: -i.bak: No such file or directory See http://hydra.nixos.org/build/5829944/nixlog/1/raw for more details. --- pkgs/development/interpreters/perl/5.16/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index 4cf809c66ed..60bfacf419b 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -77,12 +77,12 @@ stdenv.mkDerivation rec { cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t \ '' + " "; - postPatch = '' + postPatch = optionalString (!stdenv.isDarwin) /* this failed on Darwin, no idea why */ '' for test in ${testsToSkip}; do echo "Removing test" $test rm "$test" pat=`echo "$test" | sed 's,/,\\\\/,g'` # just escape slashes - sed "/^$pat/d" -i.bak MANIFEST + sed "/^$pat/d" -i MANIFEST done '';