* Removed some obsolete nullglobs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15140
This commit is contained in:
parent
01fdf66360
commit
fd473913f5
|
@ -57,7 +57,6 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
||||||
ensureDir $out/debs
|
ensureDir $out/debs
|
||||||
find . -name "*.deb" -exec cp {} $out/debs \;
|
find . -name "*.deb" -exec cp {} $out/debs \;
|
||||||
|
|
||||||
shopt -s nullglob
|
|
||||||
for i in $out/debs/*.deb; do
|
for i in $out/debs/*.deb; do
|
||||||
header "Generated DEB package: $i"
|
header "Generated DEB package: $i"
|
||||||
dpkg-deb --info "$i"
|
dpkg-deb --info "$i"
|
||||||
|
|
|
@ -26,7 +26,6 @@ vmTools.buildRPM (
|
||||||
''; # */
|
''; # */
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
shopt -s nullglob
|
|
||||||
for i in $out/rpms/*/*.rpm; do
|
for i in $out/rpms/*/*.rpm; do
|
||||||
echo "file rpm $i" >> $out/nix-support/hydra-build-products
|
echo "file rpm $i" >> $out/nix-support/hydra-build-products
|
||||||
done
|
done
|
||||||
|
|
|
@ -49,7 +49,6 @@ stdenv.mkDerivation (
|
||||||
|
|
||||||
postHook = ''
|
postHook = ''
|
||||||
ensureDir $out/nix-support
|
ensureDir $out/nix-support
|
||||||
shopt -s nullglob
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
|
|
|
@ -543,7 +543,6 @@ in
|
||||||
sed -i 's/$PYTHON/true/' istanbul-0.2.2/configure
|
sed -i 's/$PYTHON/true/' istanbul-0.2.2/configure
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
export DESTDIR="$out"
|
export DESTDIR="$out"
|
||||||
shopt -s nullglob
|
|
||||||
'';
|
'';
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://zaheer.merali.org/istanbul-0.2.2.tar.bz2;
|
url = http://zaheer.merali.org/istanbul-0.2.2.tar.bz2;
|
||||||
|
|
Loading…
Reference in New Issue