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

makeImageFromDebDist: accept additional parameters for vm, as in rpm version.

Browse Source
This commit is contained in:
Carles Pagès 2016-05-11 15:40:44 +02:00 committed by Carles Pagès
parent a0e8d542c7
commit e7ab828da1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -572,10 +572,11 @@ rec {
strongly connected components. See deb/deb-closure.nix. */
fillDiskWithDebs =
{ size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS }:
{ size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS
, QEMU_OPTS ? "", memSize ? 512 }:
runInLinuxVM (stdenv.mkDerivation {
inherit name postInstall;
inherit name postInstall QEMU_OPTS memSize;
debs = (lib.intersperse "|" debs);
@ -734,7 +735,8 @@ rec {
makeImageFromDebDist =
{ name, fullName, size ? 4096, urlPrefix
, packagesList ? "", packagesLists ? [packagesList]
, packages, extraPackages ? [], postInstall ? "" }:
, packages, extraPackages ? [], postInstall ? ""
, QEMU_OPTS ? "", memSize ? 512 }:
let
expr = debClosureGenerator {
@ -743,7 +745,7 @@ rec {
};
in
(fillDiskWithDebs {
inherit name fullName size postInstall;
inherit name fullName size postInstall QEMU_OPTS memSize;
debs = import expr {inherit fetchurl;};
}) // {inherit expr;};