cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/etc: simplify source path handling

Browse source 
This change is strictly functionally equivalent because we're just
lifting the transformation of `source` out of `mapAttrs` to the single point of
use (in escapeShellArgs).

This is also much faster because we can skip a map over all `etc` items.
This commit is contained in:
Erik Arvstedt 2021-09-25 14:32:58 +02:00
parent f05a99e116
commit 654f41435b
No known key found for this signature in database
GPG key ID: 33312B944DD97846
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/system/etc/etc.nix
View file

@ -6,9 +6,7 @@ with lib;
let let
# if the source is a local file, it should be imported to the store etc' = filter (f: f.enable) (attrValues config.environment.etc);
localToStore = mapAttrs (name: value: if name == "source" then "${value}" else value);
etc' = map localToStore (filter (f: f.enable) (attrValues config.environment.etc));
etc = pkgs.runCommandLocal "etc" { etc = pkgs.runCommandLocal "etc" {
# This is needed for the systemd module # This is needed for the systemd module
@ -55,7 +53,8 @@ let
mkdir -p "$out/etc" mkdir -p "$out/etc"
${concatMapStringsSep "\n" (etcEntry: escapeShellArgs [ ${concatMapStringsSep "\n" (etcEntry: escapeShellArgs [
"makeEtcEntry" "makeEtcEntry"
etcEntry.source # Force local source paths to be added to the store
"${etcEntry.source}"
etcEntry.target etcEntry.target
etcEntry.mode etcEntry.mode
etcEntry.user etcEntry.user