From b3fa714f1fc7d550199404332a21e11ad2ab6f84 Mon Sep 17 00:00:00 2001 From: Christophe Raffalli Date: Tue, 4 Jun 2013 20:30:50 +0200 Subject: [PATCH] upgraded lablgtk to version 2.16 to allow compilation with ocaml-4.00.1 --- pkgs/development/ocaml-modules/lablgtk/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 8a51c216ab40..a62f4ab9ae96 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -3,25 +3,26 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.14.2"; + version = "2.16.0"; in stdenv.mkDerivation (rec { name = "${pname}-${version}"; src = fetchurl { - url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${name}.tar.gz"; - sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; + url = "https://forge.ocamlcore.org/frs/download.php/979/${name}.tar.gz"; + sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f"; }; buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview]; - patches = [ ./META.patch ]; + # patches = [ ./META.patch ]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; buildFlags = "world"; - postInstall = '' - ocamlfind install lablgtk2 META + preInstall = '' + mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib + export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH ''; meta = {