Merge pull request #50504 from symphorien/local-closureInfo

nixos: add preferLocalBuild=true; on derivations for config files and closureInfo
This commit is contained in:
Silvan Mosberger
2019-02-22 20:53:17 +01:00
committed by GitHub
56 changed files with 99 additions and 60 deletions
+2
View File
@@ -113,6 +113,7 @@ let
{ xfs = optionalString (cfg.useXFS != false)
''FontPath "${toString cfg.useXFS}"'';
inherit (cfg) config;
preferLocalBuild = true;
}
''
echo 'Section "Files"' >> $out
@@ -705,6 +706,7 @@ in
system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" {
inherit (cfg) xkbModel layout xkbVariant xkbOptions;
nativeBuildInputs = [ pkgs.xkbvalidate ];
preferLocalBuild = true;
} ''
validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
touch "$out"