diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-02-22 20:53:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 20:53:17 +0100 |
| commit | c0318efe9ac76f6a18e41eacfa879e24c87f30e4 (patch) | |
| tree | cd84c2aa9941be1c5ba6c4c484e231ae65e7fb5b /nixos/modules/system | |
| parent | d011a91b70e5863d1355c999fa65ccba830ab093 (diff) | |
| parent | a915b33315946b9e7d164d57812ee16172ad65df (diff) | |
| download | nixlib-c0318efe9ac76f6a18e41eacfa879e24c87f30e4.tar nixlib-c0318efe9ac76f6a18e41eacfa879e24c87f30e4.tar.gz nixlib-c0318efe9ac76f6a18e41eacfa879e24c87f30e4.tar.bz2 nixlib-c0318efe9ac76f6a18e41eacfa879e24c87f30e4.tar.lz nixlib-c0318efe9ac76f6a18e41eacfa879e24c87f30e4.tar.xz nixlib-c0318efe9ac76f6a18e41eacfa879e24c87f30e4.tar.zst nixlib-c0318efe9ac76f6a18e41eacfa879e24c87f30e4.zip | |
Merge pull request #50504 from symphorien/local-closureInfo
nixos: add preferLocalBuild=true; on derivations for config files and closureInfo
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 14 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 5e27b24ac447..9984a97bbdd2 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -196,9 +196,10 @@ let ''; # */ - udevRules = pkgs.runCommand "udev-rules" - { allowedReferences = [ extraUtils ]; } - '' + udevRules = pkgs.runCommand "udev-rules" { + allowedReferences = [ extraUtils ]; + preferLocalBuild = true; + } '' mkdir -p $out echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules @@ -298,9 +299,10 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } - { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" - { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; } - '' + { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { + src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; + preferLocalBuild = true; + } '' target=$out ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 9fdef0251d70..bf1b1b417b16 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -759,7 +759,10 @@ in environment.etc = let # generate contents for /etc/systemd/system-generators from # systemd.generators and systemd.generator-packages - generators = pkgs.runCommand "system-generators" { packages = cfg.generator-packages; } '' + generators = pkgs.runCommand "system-generators" { + preferLocalBuild = true; + packages = cfg.generator-packages; + } '' mkdir -p $out for package in $packages do |