extra deb/rpm changes
svn path=/nixpkgs/trunk/; revision=17560
This commit is contained in:
parent
068b2158f5
commit
4d5141bd2c
@ -38,7 +38,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
|||||||
|
|
||||||
installExtraDebsPhase = ''
|
installExtraDebsPhase = ''
|
||||||
for i in $extraDebs; do
|
for i in $extraDebs; do
|
||||||
dpkg --install $i
|
dpkg --install $(ls $i/debs/*.deb | sort | head -1)
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -458,7 +458,9 @@ rec {
|
|||||||
|
|
||||||
prepareImagePhase = ''
|
prepareImagePhase = ''
|
||||||
if test -n "$extraRPMs"; then
|
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
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user