diff options
| -rw-r--r-- | pkgs/build-support/release/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/build-support/release/make-source-tarball.nix | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index f90c56fbc8e..e26c9d7e88b 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -4,8 +4,10 @@ with pkgs; rec { - makeSourceTarball = args: import ./make-source-tarball.nix - ({inherit stdenv autoconf automake libtool;} // args); + makeSourceTarball = args: import ./make-source-tarball.nix ( + { inherit autoconf automake libtool; + stdenv = stdenvNew; + } // args); nixBuild = args: import ./nix-build.nix ( { inherit stdenv; diff --git a/pkgs/build-support/release/make-source-tarball.nix b/pkgs/build-support/release/make-source-tarball.nix index e92ad2dea10..3a5123ce3f8 100644 --- a/pkgs/build-support/release/make-source-tarball.nix +++ b/pkgs/build-support/release/make-source-tarball.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation ( showBuildStats = true; - phases = "unpackPhase patchPhase autoconfPhase configurePhase buildPhase installPhase checkPhase distPhase"; + preConfigurePhases = "autoconfPhase"; + postPhases = "finalPhase"; } # Then, the caller-supplied attributes. @@ -84,7 +85,7 @@ stdenv.mkDerivation ( # Cause distPhase to copy tar.bz2 in addition to tar.gz. tarballs = "*.tar.gz *.tar.bz2"; - postDist = '' + finalPhase = '' shopt -s nullglob for i in $out/tarballs/*; do echo "file source-dist $i" >> $out/nix-support/hydra-build-products |