summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml/opam
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-10-31 16:50:15 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2019-11-01 14:44:44 -0400
commit2811b032d639684d3983282e9d10d89f37d161d5 (patch)
tree8354d496dc4207144775f458d81c3b1224014b43 /pkgs/development/tools/ocaml/opam
parent1290e532eac8f8a1815c0aedee94796509e04e3d (diff)
downloadnixpkgs-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/tools/ocaml/opam')
-rw-r--r--pkgs/development/tools/ocaml/opam/opam-shebangs.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
index f74ac84ca6b..13aa7a89570 100644
--- a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
+++ b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
@@ -64,7 +64,7 @@ index 00000000..3ea84e2d
 +header() { echo "$1"; }
 +stopNest() { true; }
 +
-+fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
++fixupOutputHooks+=('if [ -z "${dontPatchShebangs-}" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
 +
 +patchShebangs() {
 +    local dir="$1"