extra deb/rpm changes

svn path=/nixpkgs/trunk/; revision=17560
This commit is contained in:
Rob Vermaas 2009-10-01 07:25:50 +00:00
parent 068b2158f5
commit 4d5141bd2c
2 changed files with 4 additions and 2 deletions

View file

@ -38,7 +38,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
installExtraDebsPhase = ''
for i in $extraDebs; do
dpkg --install $i
dpkg --install $(ls $i/debs/*.deb | sort | head -1)
done
'';

View file

@ -458,7 +458,9 @@ rec {
prepareImagePhase = ''
if test -n "$extraRPMs"; then
rpm -iv $extraRPMs
for rpmdir in $extraRPMs ; do
rpm -iv $(ls $rpmdir/rpms/*/*.rpm | grep -v 'src\.rpm' | sort | head -1)
done
fi
'';