extra deb/rpm changes

svn path=/nixpkgs/trunk/; revision=17560
2009-10-01 07:25:50 +00:00 · 2009-10-01 07:25:50 +00:00 · 4d5141bd2c
commit 4d5141bd2c
parent 068b2158f5
2 changed files with 4 additions and 2 deletions
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@ -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
    '';

--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -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
    '';