diff options
| author | volth <volth@volth.com> | 2019-04-18 01:11:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 01:11:04 +0000 |
| commit | ca7a18a24b4e54fb8ed2d756cd1c017e1aa67774 (patch) | |
| tree | 971dc0592ad62153e5718a06376a8c248322b506 /nixos/modules/installer/netboot/netboot.nix | |
| parent | 1e8606946fd92a4d163e779d55e9d4cbd93173c8 (diff) | |
| download | nixpkgs-ca7a18a24b4e54fb8ed2d756cd1c017e1aa67774.tar nixpkgs-ca7a18a24b4e54fb8ed2d756cd1c017e1aa67774.tar.gz nixpkgs-ca7a18a24b4e54fb8ed2d756cd1c017e1aa67774.tar.bz2 nixpkgs-ca7a18a24b4e54fb8ed2d756cd1c017e1aa67774.tar.lz nixpkgs-ca7a18a24b4e54fb8ed2d756cd1c017e1aa67774.tar.xz nixpkgs-ca7a18a24b4e54fb8ed2d756cd1c017e1aa67774.tar.zst nixpkgs-ca7a18a24b4e54fb8ed2d756cd1c017e1aa67774.zip | |
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'
Diffstat (limited to 'nixos/modules/installer/netboot/netboot.nix')
| -rw-r--r-- | nixos/modules/installer/netboot/netboot.nix | 3 |
1 files changed, 1 insertions, 2 deletions
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; }; |