swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55003 from volth/patch-303

Browse source 
linkFarm: hacky quoting -> escapeShellArg
This commit is contained in:
Michael Raskin 2019-02-10 14:43:22 +00:00 committed by GitHub
parent c40f211499 f07c113ddc
commit f4a8ac84fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/build-support/trivial-builders.nix
View file

@ -258,15 +258,17 @@ rec {
* Example: * Example:
* *
* # Symlinks hello path in store to current $out/hello * # Symlinks hello path in store to current $out/hello
* linkFarm "hello" entries = [ { name = "hello"; path = pkgs.hello; } ]; * linkFarm "hello" [ { name = "hello"; path = pkgs.hello; } ];
* *
*/ */
linkFarm = name: entries: runCommand name { preferLocalBuild = true; } linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; }
("mkdir -p $out; cd $out; \n" + ''mkdir -p $out
(lib.concatMapStrings (x: '' cd $out
mkdir -p "$(dirname '${x.name}')" ${lib.concatMapStrings (x: ''
ln -s '${x.path}' '${x.name}' mkdir -p "$(dirname ${lib.escapeShellArg x.name})"
'') entries)); ln -s ${lib.escapeShellArg x.path} ${lib.escapeShellArg x.name}
'') entries}
'';
/* Print an error message if the file with the specified name and /* Print an error message if the file with the specified name and