JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Don't repeat the standard definition of $phases.

Browse Source 
svn path=/nixpkgs/trunk/; revision=13493
This commit is contained in:
Eelco Dolstra 2008-11-28 16:12:50 +00:00
parent 8bcfad7e9c
commit e056ebd34e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/release/default.nix
View File

@ -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;

5
pkgs/build-support/release/make-source-tarball.nix
View File

@ -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