diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-18 15:36:56 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-18 15:36:56 +0100 |
commit | da12fc683846f3dcac07eb353cf0ec69e907ccd0 (patch) | |
tree | 539e94f0207e8419c99dd9d9e01a800b0d55e4a7 /nixos/lib | |
parent | 3e4afc2d9fd2ec92c72f3ad08b794c1f48164377 (diff) | |
parent | 6a78f9866f1ef2c63471ecd42a2e4c51c5bf20ef (diff) |
Merge staging-next into staging
Diffstat (limited to 'nixos/lib')
-rw-r--r-- | nixos/lib/make-iso9660-image.nix | 2 | ||||
-rw-r--r-- | nixos/lib/make-system-tarball.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 6a0e0e7c635a..549530965f6e 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -48,7 +48,7 @@ assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = isoName; builder = ./make-iso9660-image.sh; - buildInputs = [ xorriso syslinux zstd libossp_uuid ]; + nativeBuildInputs = [ xorriso syslinux zstd libossp_uuid ]; inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable; diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix index dee91a6ce3f4..dab168f4a481 100644 --- a/nixos/lib/make-system-tarball.nix +++ b/nixos/lib/make-system-tarball.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { name = "tarball"; builder = ./make-system-tarball.sh; - buildInputs = extraInputs; + nativeBuildInputs = extraInputs; inherit fileName extraArgs extraCommands compressCommand; |