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

Merge pull request #114853 from lourkeur/fix-string-escaping

Browse Source 
nixos/kresd, nixos/dokuwiki, tests/fpm, build-bazel-package, libcutl: fix string escaping
This commit is contained in:
taku0
2021-03-03 19:35:16 +09:00
committed by GitHub
parent c16de94bd9 17cc2e7543
commit 61706fc470
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/build-bazel-package/default.nix
+2 -2
View File
@@ -108,8 +108,8 @@ in stdenv.mkDerivation (fBuildAttrs // {
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""}
rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\@local_config_cc.marker}" else ""}
${if removeLocal then "rm -rf $bazelOut/external/{local_*,\@local_*.marker}" else ""}
${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""}
${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""}
# Clear markers
find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \;