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

nixos/netboot: import -> callPackage

Browse Source 
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'
This commit is contained in:
volth 2019-04-18 01:11:04 +00:00 committed by GitHub
parent 1e8606946f
commit ca7a18a24b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/installer/netboot/netboot.nix
View File

@ -65,8 +65,7 @@ with lib;
[ config.system.build.toplevel ]; [ config.system.build.toplevel ];
# Create the squashfs image that contains the Nix store. # Create the squashfs image that contains the Nix store.
system.build.squashfsStore = import ../../../lib/make-squashfs.nix { system.build.squashfsStore = pkgs.callPackage ../../../lib/make-squashfs.nix {
inherit (pkgs) stdenv squashfsTools closureInfo;
storeContents = config.netboot.storeContents; storeContents = config.netboot.storeContents;
}; };