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

vmTools/deb tools: pass through args

Browse Source 
This is useful for adding preVM/postVM steps.
This commit is contained in:
Linus Heckemann 2023-01-28 11:23:45 +01:00
parent 01d078d970
commit e6a4a3feea
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -578,9 +578,9 @@ rec {
fillDiskWithDebs =
{ size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS
, QEMU_OPTS ? "", memSize ? 512 }:
, QEMU_OPTS ? "", memSize ? 512, ... }@args:
runInLinuxVM (stdenv.mkDerivation {
runInLinuxVM (stdenv.mkDerivation ({
inherit name postInstall QEMU_OPTS memSize;
debs = (lib.intersperse "|" debs);
@ -649,7 +649,6 @@ rec {
echo "running post-install script..."
eval "$postInstall"
ln -sf dash /mnt/bin/sh
rm /mnt/.debug
@ -660,7 +659,7 @@ rec {
'';
passthru = { inherit fullName; };
});
} // args));
/* Generate a Nix expression containing fetchurl calls for the
@ -746,7 +745,7 @@ rec {
, packagesList ? "", packagesLists ? [packagesList]
, packages, extraPackages ? [], postInstall ? ""
, extraDebs ? [], createRootFS ? defaultCreateRootFS
, QEMU_OPTS ? "", memSize ? 512 }:
, QEMU_OPTS ? "", memSize ? 512, ... }@args:
let
expr = debClosureGenerator {
@ -754,10 +753,10 @@ rec {
packages = packages ++ extraPackages;
};
in
(fillDiskWithDebs {
(fillDiskWithDebs ({
inherit name fullName size postInstall createRootFS QEMU_OPTS memSize;
debs = import expr {inherit fetchurl;} ++ extraDebs;
}) // {inherit expr;};
} // args)) // {inherit expr;};
/* The set of supported RPM-based distributions. */