diff options
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/opam/default.nix | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix index a4852a8aba07..d8c289015b2f 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned ]; + postPatch = "patchShebangs lib/generate_stubs.sh"; + propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; buildPhase = "jbuilder build -p js_of_ocaml"; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 28d4724a1627..63f79981e1b2 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,6 +1,5 @@ { stdenv, lib, fetchgit, fetchurl, makeWrapper, - ocaml, unzip, ncurses, curl, - aspcudSupport ? !stdenv.isDarwin, aspcud + ocaml, unzip, ncurses, curl, aspcud }: assert lib.versionAtLeast ocaml.version "3.12.1"; @@ -72,12 +71,10 @@ in stdenv.mkDerivation rec { # Dirty, but apparently ocp-build requires a TERM makeFlags = ["TERM=screen"]; - postInstall = - if aspcudSupport then '' - wrapProgram $out/bin/opam \ - --suffix PATH : ${aspcud}/bin - '' - else ""; + postInstall = '' + wrapProgram $out/bin/opam \ + --suffix PATH : ${aspcud}/bin + ''; doCheck = false; |