summary refs log tree commit diff
path: root/pkgs/build-support/vm
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-07-27 20:24:42 +0200
committerEelco Dolstra <edolstra@gmail.com>2017-07-27 20:34:24 +0200
commit63d7b6ee291999b257018950b11d530ae43ead4b (patch)
treee404fda5bb29990bd496e10fe9fd455fa56aca10 /pkgs/build-support/vm
parent2799a94963aaf37f059b5ed4c0d2b0cf98ba445e (diff)
downloadnixpkgs-63d7b6ee291999b257018950b11d530ae43ead4b.tar
nixpkgs-63d7b6ee291999b257018950b11d530ae43ead4b.tar.gz
nixpkgs-63d7b6ee291999b257018950b11d530ae43ead4b.tar.bz2
nixpkgs-63d7b6ee291999b257018950b11d530ae43ead4b.tar.lz
nixpkgs-63d7b6ee291999b257018950b11d530ae43ead4b.tar.xz
nixpkgs-63d7b6ee291999b257018950b11d530ae43ead4b.tar.zst
nixpkgs-63d7b6ee291999b257018950b11d530ae43ead4b.zip
makeImageFromDebDist: Add extraDebs arguments
This allows adding packages that are not part of the distribution, e.g.g

  extraDebs = [
    (pkgs.fetchurl {
      name = "openjdk.deb";
      url = http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jdk-headless_8u111-b14-3~14.04.1_amd64.deb;
      sha256 = "1n5ibpkx9pjmc4nr052rls1yqbq7ckav2rabixjhd4yxbyhjl0ap";
    })
  ];
Diffstat (limited to 'pkgs/build-support/vm')
-rw-r--r--pkgs/build-support/vm/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 8ec82214964..d886e9a56fa 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -750,6 +750,7 @@ rec {
     { name, fullName, size ? 4096, urlPrefix
     , packagesList ? "", packagesLists ? [packagesList]
     , packages, extraPackages ? [], postInstall ? ""
+    , extraDebs ? []
     , QEMU_OPTS ? "", memSize ? 512 }:
 
     let
@@ -760,7 +761,7 @@ rec {
     in
       (fillDiskWithDebs {
         inherit name fullName size postInstall QEMU_OPTS memSize;
-        debs = import expr {inherit fetchurl;};
+        debs = import expr {inherit fetchurl;} ++ extraDebs;
       }) // {inherit expr;};