diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-10-31 16:50:15 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-01 14:44:44 -0400 |
| commit | 2811b032d639684d3983282e9d10d89f37d161d5 (patch) | |
| tree | 8354d496dc4207144775f458d81c3b1224014b43 /pkgs/build-support/build-dotnet-package/default.nix | |
| parent | 1290e532eac8f8a1815c0aedee94796509e04e3d (diff) | |
| download | nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.gz nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.bz2 nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.lz nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.xz nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.zst nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.zip | |
treewide: Make still dont* Variables are optional in most cases
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case: - cc-wrapper's `dontlink`, because it already is handled. Also, in nix files escaping was manually added. EMP
Diffstat (limited to 'pkgs/build-support/build-dotnet-package/default.nix')
| -rw-r--r-- | pkgs/build-support/build-dotnet-package/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index f36c69e4339..dae9ed888c7 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -29,9 +29,9 @@ attrsOrig @ configurePhase = '' runHook preConfigure - [ -z "$dontPlacateNuget" ] && placate-nuget.sh - [ -z "$dontPlacatePaket" ] && placate-paket.sh - [ -z "$dontPatchFSharpTargets" ] && patch-fsharp-targets.sh + [ -z "''${dontPlacateNuget-}" ] && placate-nuget.sh + [ -z "''${dontPlacatePaket-}" ] && placate-paket.sh + [ -z "''${dontPatchFSharpTargets-}" ] && patch-fsharp-targets.sh runHook postConfigure ''; @@ -69,7 +69,7 @@ attrsOrig @ cp -rv ${arrayToShell outputFiles} "''${outputFilesArray[@]}" "$target" - if [ -z "$dontRemoveDuplicatedDlls" ] + if [ -z "''${dontRemoveDuplicatedDlls-}" ] then pushd "$out" remove-duplicated-dlls.sh |