1 files changed, 25 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
index d92cf543f80..0677202fab9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
@@ -1,26 +1,43 @@
-{ stdenv, fetchurl, ocaml, findlib, tcl, tk }:
+{ stdenv, fetchurl, fetchzip, ocaml, findlib, tcl, tk }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.04"
+let OCamlVersionAtLeast = stdenv.lib.versionAtLeast ocaml.version; in
+
+if !OCamlVersionAtLeast "4.04"
 then throw "labltk is not available for OCaml ${ocaml.version}"
 else
 
-let param = {
-  "4.04" = {
+let param =
+if OCamlVersionAtLeast "4.08" then rec {
+  version = "8.06.7";
+  src = fetchzip {
+    url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz";
+    sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h";
+  };
+} else
+  let mkOldParam = { version, key, sha256 }: {
+    src = fetchurl {
+      url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz";
+      inherit sha256;
+    };
+    inherit version;
+  }; in
+ {
+  "4.04" = mkOldParam {
     version = "8.06.2";
     key = "1628";
     sha256 = "1p97j9s33axkb4yyl0byhmhlyczqarb886ajpyggizy2br3a0bmk";
   };
-  "4.05" = {
+  "4.05" = mkOldParam {
     version = "8.06.3";
     key = "1701";
     sha256 = "1rka9jpg3kxqn7dmgfsa7pmsdwm16x7cn4sh15ijyyrad9phgdxn";
   };
-  "4.06" = {
+  "4.06" = mkOldParam {
     version = "8.06.4";
     key = "1727";
     sha256 = "0j3rz0zz4r993wa3ssnk5s416b1jhj58l6z2jk8238a86y7xqcii";
   };
-  "4.07" = {
+  "4.07" = mkOldParam {
     version = "8.06.5";
     key = "1764";
     sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj";
@@ -29,14 +46,9 @@ let param = {
 in
 
 stdenv.mkDerivation rec {
-  inherit (param) version;
+  inherit (param) version src;
   name = "ocaml${ocaml.version}-labltk-${version}";
 
-  src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/${param.key}/labltk-${param.version}.tar.gz";
-    inherit (param) sha256;
-  };
-
   buildInputs = [ ocaml findlib tcl tk ];
 
   configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ];