diff options
| author | Peter Simons <simons@cryp.to> | 2016-01-24 21:06:52 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-01-24 21:06:52 +0100 |
| commit | afba955d2192acfa5219560386fb92366ac65dab (patch) | |
| tree | 13fd1904dc60eab2de7347b3f0e25e686d258684 /pkgs/development | |
| parent | 76b2ffbb087207f08eb06bfd90071f78f35f3525 (diff) | |
| parent | 4fd985b9ae242c639fb2cfa4eafb20a8f79c7cea (diff) | |
| download | nixpkgs-afba955d2192acfa5219560386fb92366ac65dab.tar nixpkgs-afba955d2192acfa5219560386fb92366ac65dab.tar.gz nixpkgs-afba955d2192acfa5219560386fb92366ac65dab.tar.bz2 nixpkgs-afba955d2192acfa5219560386fb92366ac65dab.tar.lz nixpkgs-afba955d2192acfa5219560386fb92366ac65dab.tar.xz nixpkgs-afba955d2192acfa5219560386fb92366ac65dab.tar.zst nixpkgs-afba955d2192acfa5219560386fb92366ac65dab.zip | |
Merge pull request #12598 from cstrahan/haskell-post-patch
haskell-packages: properly set postPatch
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 5d7b8d65b6a..5ddfdc41917 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -52,7 +52,7 @@ mkDerivation (rec { }; isLibrary = true; isExecutable = true; - jailbreak = false; # manually jailbreak, until postPatch in mkDerivation is fixed + jailbreak = true; doHaddock = false; doCheck = false; buildDepends = [ @@ -72,9 +72,6 @@ mkDerivation (rec { ]; patches = [ ./ghcjs.patch ]; postPatch = '' - echo "Run jailbreak-cabal to lift version restrictions on build inputs." - ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal - substituteInPlace Setup.hs \ --replace "/usr/bin/env" "${coreutils}/bin/env" diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index ad820012bd1..afd30c8283b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -299,7 +299,6 @@ stdenv.mkDerivation ({ // optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (postPatch != "") { inherit postPatch; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; } // optionalAttrs (preBuild != "") { inherit preBuild; } |