diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-04-04 16:12:43 +0300 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-04-18 20:43:22 +0200 |
| commit | 196e34279d7c2be020bd93712cd4f648423fa293 (patch) | |
| tree | 4a9d14834cf49f9e4e2163fc1ce1ca8ff5b6b8aa /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 51c90587312325aec43a331ac41995dccd419301 (diff) | |
| download | nixlib-196e34279d7c2be020bd93712cd4f648423fa293.tar nixlib-196e34279d7c2be020bd93712cd4f648423fa293.tar.gz nixlib-196e34279d7c2be020bd93712cd4f648423fa293.tar.bz2 nixlib-196e34279d7c2be020bd93712cd4f648423fa293.tar.lz nixlib-196e34279d7c2be020bd93712cd4f648423fa293.tar.xz nixlib-196e34279d7c2be020bd93712cd4f648423fa293.tar.zst nixlib-196e34279d7c2be020bd93712cd4f648423fa293.zip | |
haskellng.generic-builder: move jailbreak-cabal to postPatch
Closes https://github.com/NixOS/nixpkgs/pull/7208.
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index baefedf5a74d..158940348190 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -137,10 +137,12 @@ stdenv.mkDerivation ({ prePatch = optionalString (editedCabalFile != null) '' echo "Replace Cabal file with edited version from ${newCabalFileUrl}." cp ${newCabalFile} ${pname}.cabal - '' + optionalString jailbreak '' + '' + prePatch; + + postPatch = optionalString jailbreak '' echo "Run jailbreak-cabal to lift version restrictions on build inputs." ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal - '' + prePatch; + '' + postPatch; setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment |