diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-31 21:52:38 +0200 |
|---|---|---|
| committer | Christian Kampka <christian@kampka.net> | 2019-05-31 23:27:49 +0200 |
| commit | f2a894807856309a97c4559cc704eaaa24d7ee3f (patch) | |
| tree | 70e042dd4ec418bc344a9af22df22c1f427468e7 /nixos | |
| parent | 0d570e020e090c90701a52fac55ac3c6f3dbe1a2 (diff) | |
| download | nixpkgs-f2a894807856309a97c4559cc704eaaa24d7ee3f.tar nixpkgs-f2a894807856309a97c4559cc704eaaa24d7ee3f.tar.gz nixpkgs-f2a894807856309a97c4559cc704eaaa24d7ee3f.tar.bz2 nixpkgs-f2a894807856309a97c4559cc704eaaa24d7ee3f.tar.lz nixpkgs-f2a894807856309a97c4559cc704eaaa24d7ee3f.tar.xz nixpkgs-f2a894807856309a97c4559cc704eaaa24d7ee3f.tar.zst nixpkgs-f2a894807856309a97c4559cc704eaaa24d7ee3f.zip | |
treewide: use buildPackages for config builders
Partially reapplies 35af6e36057cafbb30df684326803e9e54bb377e buildPackages need to be used only for image builders. Otherwise, the bootloader builder may be setup using the wrong arch, rendering it unusable
Diffstat (limited to 'nixos')
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 7d7477aaee7..5f7194e92a3 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 282bc2b471c..71448f74c36 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 9beb4397744..96e06670694 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { |