about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-04-09 06:37:59 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-04-09 06:37:59 +0000
commit6b852ab38f7a0cca287b873f35e51de57de9a86c (patch)
tree626d4ef944cc8d2cab12a21a2d041baccffaea73 /pkgs/build-support
parentff87b2ffa99eb8ba057b4966870132cf88bafb5f (diff)
downloadnixlib-6b852ab38f7a0cca287b873f35e51de57de9a86c.tar
nixlib-6b852ab38f7a0cca287b873f35e51de57de9a86c.tar.gz
nixlib-6b852ab38f7a0cca287b873f35e51de57de9a86c.tar.bz2
nixlib-6b852ab38f7a0cca287b873f35e51de57de9a86c.tar.lz
nixlib-6b852ab38f7a0cca287b873f35e51de57de9a86c.tar.xz
nixlib-6b852ab38f7a0cca287b873f35e51de57de9a86c.tar.zst
nixlib-6b852ab38f7a0cca287b873f35e51de57de9a86c.zip
* Optionally install extra RPMs before doing the build.
svn path=/nixpkgs/trunk/; revision=11500
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/vm/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 286bfb6b38a8..dfbabcdb2d0a 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -366,9 +366,15 @@ rec {
      tarball must contain an RPM specfile. */
   
   buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({
-    phases = "sysInfoPhase buildPhase installPhase";
+    phases = "prepareImagePhase sysInfoPhase buildPhase installPhase";
 
     outDir = "rpms/${attrs.diskImage.name}";
+
+    prepareImagePhase = ''
+      for rpm in $extraRPMs; do
+        rpm -iv $rpm
+      done
+    '';
   
     sysInfoPhase = ''
       header "base RPMs"