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

nixos: use nativeBuildInputs in make- iso9660-image and system-tarball

Browse Source 
The tools used to create iso9660 images and tarballs are independent of
the platform of the closure contained within.
This commit is contained in:
Emery Hemingway 2020-11-18 13:58:24 +01:00
parent 6e9e1a0c42
commit 7e25b71132
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/lib/make-iso9660-image.nix
View File

@ -48,7 +48,7 @@ assert usbBootable -> isohybridMbrImage != "";
stdenv.mkDerivation { stdenv.mkDerivation {
name = isoName; name = isoName;
builder = ./make-iso9660-image.sh; 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; inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable;

2
nixos/lib/make-system-tarball.nix
View File

@ -37,7 +37,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tarball"; name = "tarball";
builder = ./make-system-tarball.sh; builder = ./make-system-tarball.sh;
buildInputs = extraInputs; nativeBuildInputs = extraInputs;
inherit fileName extraArgs extraCommands compressCommand; inherit fileName extraArgs extraCommands compressCommand;