From 4d5141bd2cb972d943e643fc321bf4670beb3c9b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 1 Oct 2009 07:25:50 +0000 Subject: [PATCH] extra deb/rpm changes svn path=/nixpkgs/trunk/; revision=17560 --- pkgs/build-support/release/debian-build.nix | 2 +- pkgs/build-support/vm/default.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index a8ceb575a0b..9bdb4f9959d 100644 --- 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 ''; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index e83d5d18306..ebe329a9003 100644 --- 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 '';