* Turn on nullglob globally so that distPhase works when we copy
"*.tar.bz2 *.tar.gz" and there are no *.tar.gz files. Maybe we should turn this on in stdenv (nullglob just seems like the right thing to do in general). svn path=/nixpkgs/trunk/; revision=14606
This commit is contained in:
parent
33a5e03bfe
commit
468ffe8466
|
@ -49,6 +49,7 @@ stdenv.mkDerivation (
|
||||||
|
|
||||||
postHook = ''
|
postHook = ''
|
||||||
ensureDir $out/nix-support
|
ensureDir $out/nix-support
|
||||||
|
shopt -s nullglob
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
|
@ -87,7 +88,6 @@ stdenv.mkDerivation (
|
||||||
tarballs = "*.tar.gz *.tar.bz2";
|
tarballs = "*.tar.gz *.tar.bz2";
|
||||||
|
|
||||||
finalPhase = ''
|
finalPhase = ''
|
||||||
shopt -s nullglob
|
|
||||||
for i in $out/tarballs/*; do
|
for i in $out/tarballs/*; do
|
||||||
echo "file source-dist $i" >> $out/nix-support/hydra-build-products
|
echo "file source-dist $i" >> $out/nix-support/hydra-build-products
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue