diff options
author | Merlin Göttlinger <megoettlinger@gmail.com> | 2019-08-07 09:50:46 +0200 |
---|---|---|
committer | Merlin Göttlinger <megoettlinger@gmail.com> | 2019-08-07 09:50:46 +0200 |
commit | b1f0e3ebc55ea8bde2806d83896e0f14db73a410 (patch) | |
tree | a300f7c8387d0318460c824bc76ff7cc7cbcdbea /pkgs/build-support/ocaml | |
parent | 6e6c1448faaf4d8fd131ac1cde221eeb3813573d (diff) | |
download | nixpkgs-b1f0e3ebc55ea8bde2806d83896e0f14db73a410.tar nixpkgs-b1f0e3ebc55ea8bde2806d83896e0f14db73a410.tar.gz nixpkgs-b1f0e3ebc55ea8bde2806d83896e0f14db73a410.tar.bz2 nixpkgs-b1f0e3ebc55ea8bde2806d83896e0f14db73a410.tar.lz nixpkgs-b1f0e3ebc55ea8bde2806d83896e0f14db73a410.tar.xz nixpkgs-b1f0e3ebc55ea8bde2806d83896e0f14db73a410.tar.zst nixpkgs-b1f0e3ebc55ea8bde2806d83896e0f14db73a410.zip |
Suggested edits
Diffstat (limited to 'pkgs/build-support/ocaml')
-rw-r--r-- | pkgs/build-support/ocaml/oasis.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix index 00f75c76597..74977486f2f 100644 --- a/pkgs/build-support/ocaml/oasis.nix +++ b/pkgs/build-support/ocaml/oasis.nix @@ -1,17 +1,19 @@ { stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }: -{ name, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; }, - minimumOcamlVersion ? null, +{ pname, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; }, + minimumOCamlVersion ? null, createFindlibDestdir ? true, dontStrip ? true, ... }@args: - assert minimumOcamlVersion != null -> - stdenv.lib.versionOlder minimumOcamlVersion ocaml.version; +if args ? minimumOCamlVersion && + ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion +then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation (args // { - name = "ocaml${ocaml.version}-${name}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${version}"; buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis ] ++ buildInputs; |