Revert "treewide: use buildPackages for config builders"

This reverts commit 35af6e3605.
This commit is contained in:
Christian Kampka 2019-05-31 21:51:29 +02:00
parent fd15f37b37
commit 0d570e020e
8 changed files with 13 additions and 12 deletions

View file

@ -5,7 +5,7 @@
let
extlinux-conf-builder =
import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
pkgs = pkgs.buildPackages;
inherit pkgs;
};
in
{

View file

@ -5,7 +5,7 @@
let
extlinux-conf-builder =
import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
pkgs = pkgs.buildPackages;
inherit pkgs;
};
in
{

View file

@ -5,7 +5,7 @@
let
extlinux-conf-builder =
import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
pkgs = pkgs.buildPackages;
inherit pkgs;
};
in
{

View file

@ -7,8 +7,8 @@ let
generationsDirBuilder = pkgs.substituteAll {
src = ./generations-dir-builder.sh;
isExecutable = true;
inherit (pkgs.buildPackages) bash;
path = with pkgs.buildPackages; [coreutils gnused gnugrep];
inherit (pkgs) bash;
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
inherit (config.boot.loader.generationsDir) copyKernels;
};

View file

@ -8,7 +8,7 @@ let
timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
builder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; };
builder = import ./extlinux-conf-builder.nix { inherit pkgs; };
in
{
options = {

View file

@ -7,8 +7,8 @@ let
initScriptBuilder = pkgs.substituteAll {
src = ./init-script-builder.sh;
isExecutable = true;
inherit (pkgs.buildPackages) bash;
path = with pkgs.buildPackages; [coreutils gnused gnugrep];
inherit (pkgs) bash;
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
};
in

View file

@ -18,17 +18,18 @@ let
extlinuxConfBuilder =
import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
pkgs = pkgs.buildPackages;
inherit pkgs;
};
in
pkgs.substituteAll {
src = ./uboot-builder.sh;
isExecutable = true;
inherit (pkgs.buildPackages) bash;
path = with pkgs.buildPackages; [coreutils gnused gnugrep];
inherit (pkgs) bash;
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
firmware = pkgs.raspberrypifw;
inherit uboot;
inherit configTxt;
inherit extlinuxConfBuilder;
inherit version;
}

View file

@ -12,7 +12,7 @@ let
isExecutable = true;
inherit (pkgs.buildPackages) python3;
inherit (pkgs) python3;
systemd = config.systemd.package;