diff options
| author | Aaron L. Zeng <me@bcc32.com> | 2022-11-26 01:54:19 -0500 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-12-24 07:02:26 +0100 |
| commit | 40f2537b56af100b7a2e8762e7b8a8b3f60e2869 (patch) | |
| tree | f6b4f11a811e77d4f12d6fb26a5fd51a780ad02d | |
| parent | 705e2261b4c624ea282186a7f48f4101de7a563f (diff) | |
patdiff: Fix patdiff-git-wrapper's shebang line
This package uses /bin/bash, which wasn't being automatically patched
because it wasn't provided bash as a build input.
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/0.15.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 7201bc207aaa..83a52c9b23bb 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -1,4 +1,5 @@ { self +, bash , fetchpatch , lib , openssl @@ -487,6 +488,10 @@ with self; patdiff = janePackage { pname = "patdiff"; hash = "0623a7n5r659rkxbp96g361mvxkcgc6x9lcbkm3glnppplk5kxr9"; + + # Used by patdiff-git-wrapper. Providing it here also causes the shebang + # line to be automatically patched. + buildInputs = [ bash ]; propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ]; meta = { description = "File Diff using the Patience Diff algorithm"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 39503ee138b1..27d42a85c5a8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1570,7 +1570,7 @@ let if lib.versionOlder "4.10.2" ocaml.version then import ../development/ocaml-modules/janestreet/0.15.nix { inherit self; - inherit (pkgs) fetchpatch lib openssl zstd; + inherit (pkgs) bash fetchpatch lib openssl zstd; } else if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { |