colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #139431 from erikarvstedt/etc-simplify-source

Browse Source 
nixos/etc: simplify source path handling
This commit is contained in:
Robert Hensing 2021-10-03 00:50:39 +02:00 committed by GitHub
commit c3bf08d1b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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