JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makeImageFromDebDist: Add extraDebs arguments

Browse Source 
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";
    })
  ];
This commit is contained in:
Eelco Dolstra 2017-07-27 20:24:42 +02:00
parent 2799a94963
commit 63d7b6ee29
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/vm/default.nix
View File

@ -750,6 +750,7 @@ rec {
{ name, fullName, size ? 4096, urlPrefix { name, fullName, size ? 4096, urlPrefix
, packagesList ? "", packagesLists ? [packagesList] , packagesList ? "", packagesLists ? [packagesList]
, packages, extraPackages ? [], postInstall ? "" , packages, extraPackages ? [], postInstall ? ""
, extraDebs ? []
, QEMU_OPTS ? "", memSize ? 512 }: , QEMU_OPTS ? "", memSize ? 512 }:
let let
@ -760,7 +761,7 @@ rec {
in in
(fillDiskWithDebs { (fillDiskWithDebs {
inherit name fullName size postInstall QEMU_OPTS memSize; inherit name fullName size postInstall QEMU_OPTS memSize;
debs = import expr {inherit fetchurl;}; debs = import expr {inherit fetchurl;} ++ extraDebs;
}) // {inherit expr;}; }) // {inherit expr;};