diff options
| author | Kirill Boltaev <aske@fmap.me> | 2016-10-05 11:32:30 +0400 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2016-10-05 09:32:30 +0200 |
| commit | 3e646865f4eb5216117dc49f3c9fb4a02ad2313b (patch) | |
| tree | 9418314db159ba326550bf4af9df1e7aa9a75332 /pkgs/build-support/ocaml/default.nix | |
| parent | 916364af72f15e7635387889d883b605948b1f1d (diff) | |
| download | nixlib-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar nixlib-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.gz nixlib-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.bz2 nixlib-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.lz nixlib-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.xz nixlib-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.zst nixlib-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.zip | |
treewide: use ocaml.version (#19192)
Diffstat (limited to 'pkgs/build-support/ocaml/default.nix')
| -rw-r--r-- | pkgs/build-support/ocaml/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index 50f7627568d2..54951dadf56d 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -9,13 +9,12 @@ meta ? {}, ... }@args: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; defaultMeta = { platforms = ocaml.meta.platforms or []; }; in assert minimumSupportedOcamlVersion != null -> - stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml_version; + stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml.version; stdenv.mkDerivation (args // { name = "ocaml-${name}-${version}"; @@ -24,11 +23,10 @@ stdenv.mkDerivation (args // { setupHook = if setupHook == null && hasSharedObjects then writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/${name}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" '' else setupHook; - inherit ocaml_version; inherit createFindlibDestdir; inherit dontStrip; |