diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ocaml-modules/eliom/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 1147c3054170..219f104271d3 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -3,7 +3,11 @@ ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, reactivedata, opam, ppx_tools, camlp4}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; +let ocamlVersion = (stdenv.lib.getVersion ocaml); + in + +( +assert stdenv.lib.versionAtLeast ocamlVersion "4"; stdenv.mkDerivation rec { @@ -25,9 +29,11 @@ stdenv.mkDerivation rec calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; + preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") '' + export PPX=false + ''; + installPhase = - let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; - in ''opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh ln -s $out/lib/${pname} $out/lib/ocaml/${ocamlVersion}/site-lib/ @@ -55,4 +61,4 @@ stdenv.mkDerivation rec maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86c5329a14a8..ea416f730e33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4908,10 +4908,7 @@ in eff = callPackage ../development/interpreters/eff { }; - eliom = - if lib.versionAtLeast ocaml_version "4.02" - then callPackage ../development/ocaml-modules/eliom { } - else null; + eliom = callPackage ../development/ocaml-modules/eliom { }; enumerate = callPackage ../development/ocaml-modules/enumerate { }; |