diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2018-10-19 04:49:56 -0400 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2018-10-19 04:49:56 -0400 |
| commit | bc56701020265f86ae2007f4aab2eff8e8e34896 (patch) | |
| tree | e14bcd6df78211f09fee50d249b23bef7f98977a /pkgs/development/haskell-modules/lib.nix | |
| parent | bd4b8a4c829ea5575ba5005dc88a6d9f6a6f67ec (diff) | |
haskell.lib.buildFromSdist: Allow overrideCabal [Fixes #45018]
Diffstat (limited to '')
| -rw-r--r-- | pkgs/development/haskell-modules/lib.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 6155e158e9de..f4ebe549c502 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -245,12 +245,13 @@ rec { on hackage. This can be used as a test for the source distribution, assuming the build fails when packaging mistakes are in the cabal file. */ - buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { - unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' - echo "Source tarball is at ${src}/${tarname}.tar.gz" - tar xf ${src}/${tarname}.tar.gz - cd ${pkg.pname}-* - ''; + buildFromSdist = pkg: overrideCabal pkg (drv: { + src = "${sdistTarball pkg}/${pkg.pname}-${pkg.version}.tar.gz"; + + # Revising and jailbreaking the cabal file has been handled in sdistTarball + revision = null; + editedCabalFile = null; + jailbreak = false; }); /* Build the package in a strict way to uncover potential problems. |