summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMasayuki Takeda <mtakeda.enigsol@gmail.com>2018-03-07 19:09:32 +0900
committerMasayuki Takeda <mtakeda.enigsol@gmail.com>2018-03-07 19:09:32 +0900
commit3f738231177cb1823f912c7f566cffa94ae3440e (patch)
tree6b9f87826350c2b54d438e57dabab53bf74b5547 /pkgs/top-level
parent8154f9ebd50d1a3f94b8598b6868dad9ff6357d6 (diff)
downloadnixlib-3f738231177cb1823f912c7f566cffa94ae3440e.tar
nixlib-3f738231177cb1823f912c7f566cffa94ae3440e.tar.gz
nixlib-3f738231177cb1823f912c7f566cffa94ae3440e.tar.bz2
nixlib-3f738231177cb1823f912c7f566cffa94ae3440e.tar.lz
nixlib-3f738231177cb1823f912c7f566cffa94ae3440e.tar.xz
nixlib-3f738231177cb1823f912c7f566cffa94ae3440e.tar.zst
nixlib-3f738231177cb1823f912c7f566cffa94ae3440e.zip
camlimages: 4.1.2 -> 5.0.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/ocaml-packages.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 82467fcd78ca..f77de1057e57 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -119,7 +119,10 @@ let
     camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix {
       giflib = pkgs.giflib_4_1;
     };
-    camlimages = camlimages_4_1;
+    camlimages =
+          if lib.versionOlder "4.05" ocaml.version
+          then callPackage ../development/ocaml-modules/camlimages { }
+          else camlimages_4_1;
 
     benchmark = callPackage ../development/ocaml-modules/benchmark { };