From 7e25b7113271cf80eb0f950da2e1aa7b382eb268 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 18 Nov 2020 13:58:24 +0100 Subject: [PATCH] nixos: use nativeBuildInputs in make- iso9660-image and system-tarball The tools used to create iso9660 images and tarballs are independent of the platform of the closure contained within. --- nixos/lib/make-iso9660-image.nix | 2 +- 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;