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/development/tools/ocaml/findlib/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/development/tools/ocaml/findlib/default.nix')
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 5d9757f2666e..1391bc6eb8ab 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,9 +1,5 @@ {stdenv, fetchurl, m4, ncurses, ocaml, writeText}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; version = "1.6.1"; @@ -23,7 +19,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( -bindir $out/bin -mandir $out/share/man - -sitelib $out/lib/ocaml/${ocaml_version}/site-lib + -sitelib $out/lib/ocaml/${ocaml.version}/site-lib -config $out/etc/findlib.conf ) ''; @@ -35,10 +31,10 @@ stdenv.mkDerivation rec { setupHook = writeText "setupHook.sh" '' addOCamlPath () { - if test -d "''$1/lib/ocaml/${ocaml_version}/site-lib"; then - export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/" + if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then + export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/" fi - export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/" + export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" if test -n "$createFindlibDestdir"; then mkdir -p $OCAMLFIND_DESTDIR fi |