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/development/interpreters/python/hooks/python-catch-conflicts-hook.sh | |
| 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/development/interpreters/python/hooks/python-catch-conflicts-hook.sh')
| -rw-r--r-- | pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh index e9065cf1793..374a2eddb40 100644 --- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh @@ -5,6 +5,6 @@ pythonCatchConflictsPhase() { @pythonInterpreter@ @catchConflicts@ } -if [ -z "$dontUsePythonCatchConflicts" ]; then +if [ -z "${dontUsePythonCatchConflicts-}" ]; then preDistPhases+=" pythonCatchConflictsPhase" fi |