diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-09-22 00:51:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 00:51:22 +0100 |
| commit | 57e69a608a673bd46a863590494549dcefc812ea (patch) | |
| tree | a2deb7e483c2dc06dcfb1b6c8273aa2223e3e1be /pkgs/build-support/vm | |
| parent | b8c97a0d972c4f8a2fe38b134dcdf9d969b87c5b (diff) | |
| parent | e56bddf0dfad81c60b199c0ed1e004452960f863 (diff) | |
Merge pull request #109636 from mroi/patch-vmtools
vmTools: fix cross compilation
Diffstat (limited to 'pkgs/build-support/vm')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 3a52d756571c8..1a07e1c11591a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -13,7 +13,7 @@ with import ../../../nixos/lib/qemu-flags.nix { inherit pkgs; }; rec { - qemu = pkgs.qemu_kvm; + qemu = buildPackages.qemu_kvm; modulesClosure = makeModulesClosure { inherit kernel rootModules; @@ -24,7 +24,7 @@ rec { hd = "vda"; # either "sda" or "vda" initrdUtils = runCommand "initrd-utils" - { buildInputs = [ nukeReferences ]; + { nativeBuildInputs = [ buildPackages.nukeReferences ]; allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd } '' @@ -655,7 +655,10 @@ rec { rpmClosureGenerator = {name, packagesLists, urlPrefixes, packages, archs ? []}: assert (builtins.length packagesLists) == (builtins.length urlPrefixes); - runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} '' + runCommand "${name}.nix" { + nativeBuildInputs = [ buildPackages.perl buildPackages.perlPackages.XMLSimple ]; + inherit archs; + } '' ${lib.concatImapStrings (i: pl: '' gunzip < ${pl} > ./packages_${toString i}.xml '') packagesLists} @@ -694,7 +697,8 @@ rec { debClosureGenerator = {name, packagesLists, urlPrefix, packages}: - runCommand "${name}.nix" { buildInputs = [ perl dpkg ]; } '' + runCommand "${name}.nix" + { nativeBuildInputs = [ buildPackages.perl buildPackages.dpkg ]; } '' for i in ${toString packagesLists}; do echo "adding $i..." case $i in |