public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12598 from cstrahan/haskell-post-patch 

haskell-packages: properly set postPatch
This commit is contained in:
Peter Simons 2016-01-24 21:06:52 +01:00
parent 76b2ffbb08 4fd985b9ae
commit afba955d21
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/ghcjs/default.nix
View File

@ -52,7 +52,7 @@ mkDerivation (rec {
}; };
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
jailbreak = false; # manually jailbreak, until postPatch in mkDerivation is fixed jailbreak = true;
doHaddock = false; doHaddock = false;
doCheck = false; doCheck = false;
buildDepends = [ buildDepends = [
@ -72,9 +72,6 @@ mkDerivation (rec {
]; ];
patches = [ ./ghcjs.patch ]; patches = [ ./ghcjs.patch ];
postPatch = '' postPatch = ''
echo "Run jailbreak-cabal to lift version restrictions on build inputs."
${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
substituteInPlace Setup.hs \ substituteInPlace Setup.hs \
--replace "/usr/bin/env" "${coreutils}/bin/env" --replace "/usr/bin/env" "${coreutils}/bin/env"

1
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -299,7 +299,6 @@ stdenv.mkDerivation ({
// optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (configureFlags != []) { inherit configureFlags; }
// optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patches != []) { inherit patches; }
// optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (patchPhase != "") { inherit patchPhase; }
// optionalAttrs (postPatch != "") { inherit postPatch; }
// optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (preConfigure != "") { inherit preConfigure; }
// optionalAttrs (postConfigure != "") { inherit postConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; }
// optionalAttrs (preBuild != "") { inherit preBuild; } // optionalAttrs (preBuild != "") { inherit preBuild; }