From ca7a18a24b4e54fb8ed2d756cd1c017e1aa67774 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 18 Apr 2019 01:11:04 +0000 Subject: nixos/netboot: import -> callPackage Copy-paste from iso-image.nix Besides the simplification, it should use `pkgs.buildPackages.squashfsTools` because it is used in `nativeBuildInputs` instead of incorrect `pkgs.squashfsTools` which was forced by `import' --- nixos/modules/installer/netboot/netboot.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nixos/modules/installer/netboot/netboot.nix') diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 303d9fce3f9..cdfba5ab9e3 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -65,8 +65,7 @@ with lib; [ config.system.build.toplevel ]; # Create the squashfs image that contains the Nix store. - system.build.squashfsStore = import ../../../lib/make-squashfs.nix { - inherit (pkgs) stdenv squashfsTools closureInfo; + system.build.squashfsStore = pkgs.callPackage ../../../lib/make-squashfs.nix { storeContents = config.netboot.storeContents; }; -- cgit 1.4.1