From 2811b032d639684d3983282e9d10d89f37d161d5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 31 Oct 2019 16:50:15 +0000 Subject: 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 --- .../interpreters/python/hooks/python-catch-conflicts-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh') 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 e9065cf17934..374a2eddb407 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 -- cgit 1.4.1