diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-10-26 11:17:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-26 11:17:24 +0100 |
commit | 945c6b998126d75f713a80b0907cee4efd5d0fe1 (patch) | |
tree | e777b9018ef9693f86385671bc2f122ccb5f81db /pkgs | |
parent | 02afda3fd856378571fefc101119ae88c7ea4158 (diff) | |
parent | bc56701020265f86ae2007f4aab2eff8e8e34896 (diff) | |
download | nixlib-945c6b998126d75f713a80b0907cee4efd5d0fe1.tar nixlib-945c6b998126d75f713a80b0907cee4efd5d0fe1.tar.gz nixlib-945c6b998126d75f713a80b0907cee4efd5d0fe1.tar.bz2 nixlib-945c6b998126d75f713a80b0907cee4efd5d0fe1.tar.lz nixlib-945c6b998126d75f713a80b0907cee4efd5d0fe1.tar.xz nixlib-945c6b998126d75f713a80b0907cee4efd5d0fe1.tar.zst nixlib-945c6b998126d75f713a80b0907cee4efd5d0fe1.zip |
Merge pull request #48699 from ElvishJerricco/overridable-buildFromSdist
haskell.lib.buildFromSdist: Allow overrideCabal
Diffstat (limited to 'pkgs')
-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. |