From 196e34279d7c2be020bd93712cd4f648423fa293 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 4 Apr 2015 16:12:43 +0300 Subject: [PATCH] haskellng.generic-builder: move jailbreak-cabal to postPatch Closes https://github.com/NixOS/nixpkgs/pull/7208. --- pkgs/development/haskell-modules/generic-builder.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index baefedf5a74..15894034819 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