Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6e9e1a0c42ed
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7e25b7113271
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 18, 2020

  1. 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.
    @ehmry
    ehmry committed Nov 18, 2020
    Copy the full SHA
    7e25b71 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 nixos/lib/make-iso9660-image.nix
  2. +1 −1 nixos/lib/make-system-tarball.nix
2 changes: 1 addition & 1 deletion nixos/lib/make-iso9660-image.nix
View file
Original file line number Diff line number Diff line change
@@ -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;

2 changes: 1 addition & 1 deletion nixos/lib/make-system-tarball.nix
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ in
stdenv.mkDerivation {
name = "tarball";
builder = ./make-system-tarball.sh;
buildInputs = extraInputs;
nativeBuildInputs = extraInputs;

inherit fileName extraArgs extraCommands compressCommand;