diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-09-20 18:53:43 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-09-20 18:53:43 +0100 |
| commit | 40e79043b02a6ecb9da8766cddf99b462ba3c0ed (patch) | |
| tree | 71ec0751908430df20bbdc35840519bea4f6cb32 | |
| parent | d67588a5f1a281942f10501c5c4a0ea21126f1d1 (diff) | |
| download | nixpkgs-40e79043b02a6ecb9da8766cddf99b462ba3c0ed.tar nixpkgs-40e79043b02a6ecb9da8766cddf99b462ba3c0ed.tar.gz nixpkgs-40e79043b02a6ecb9da8766cddf99b462ba3c0ed.tar.bz2 nixpkgs-40e79043b02a6ecb9da8766cddf99b462ba3c0ed.tar.lz nixpkgs-40e79043b02a6ecb9da8766cddf99b462ba3c0ed.tar.xz nixpkgs-40e79043b02a6ecb9da8766cddf99b462ba3c0ed.tar.zst nixpkgs-40e79043b02a6ecb9da8766cddf99b462ba3c0ed.zip | |
mkOcamlPackages: simpler rule for lablgtk
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index c2f50c4e5b8..f303323b7c8 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -6,6 +6,8 @@ let version = "2.16.0"; in +assert stdenv.lib.versionAtLeast ocaml_version "3.12"; + stdenv.mkDerivation (rec { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cc8ac8eddf..c8ad1018f13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3375,13 +3375,9 @@ let lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { inherit (gnome) libgnomecanvas libglade gtksourceview; }; - - lablgtk = - if lib.strings.versionAtLeast (builtins.parseDrvName ocaml.name).version "3.12" - then callPackage ../development/ocaml-modules/lablgtk { - inherit (gnome) libgnomecanvas libglade gtksourceview; - } - else lablgtk_2_14; + lablgtk = callPackage ../development/ocaml-modules/lablgtk { + inherit (gnome) libgnomecanvas libglade gtksourceview; + }; lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { gtkmathview = callPackage ../development/libraries/gtkmathview { }; @@ -3492,8 +3488,10 @@ let }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; - ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; - ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2; + ocamlPackages_3_10_0 = (mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0) + // { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; }; + ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2) + // { lablgtk = ocamlPackages_3_11_2.lablgtk_2_14; }; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; |