···

       
1
       
1
       
-
       
{ lib, stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:

     

       
1
       
1
       
+
       
{ lib, stdenv, fetchurl, ncurses, ocaml, writeText }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
-
       
  pname = "ocaml-findlib";

     

       
5
       
5
       
-
       
  version = "1.9.3";

     

       
4
       
4
       
+
       
  pname = "ocaml${ocaml.version}-findlib";

     

       
5
       
5
       
+
       
  version = "1.9.6";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  src = fetchurl {

     

       
8
       
8
       
 
       
    url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";

     

       
9
       
9
       
-
       
    sha256 = "sha256:0hfcwamcvinmww59b5i4yxbf0kxyzkp5qv3d1c7ybn9q52vgq463";

     

       
9
       
9
       
+
       
    sha256 = "sha256-LfmWJ5rha2Bttf9Yefk9v63giY258aPoL3+EX6opMKI=";

     

       
10
       
10
       
 
       
  };

     

       
11
       
11
       
 
       


     

       
12
       
12
       
-
       
  nativeBuildInputs = [m4 ocaml];

     

       
13
       
13
       
-
       
  buildInputs = [ ncurses ];

     

       
12
       
12
       
+
       
  nativeBuildInputs = [ ocaml ];

     

       
13
       
13
       
+
       
  buildInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses;

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  patches = [ ./ldconf.patch ./install_topfind.patch ];

     

       
16
       
16
       
 
       


     

···

       
1
       
1
       
 
       
--- a/src/findlib/Makefile

     

       
2
       
2
       
 
       
+++ b/src/findlib/Makefile

     

       
3
       
3
       
-
       
@@ -123,7 +123,7 @@ clean:

     

       
3
       
3
       
+
       
@@ -123,8 +123,8 @@

     

       
4
       
4
       
 
       
 install: all

     

       
5
       
5
       
-
       
 	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"

     

       
6
       
6
       
-
       
 	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"

     

       
7
       
7
       
-
       
-	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"

     

       
8
       
8
       
-
       
+	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"

     

       
5
       
5
       
+
       
 	$(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"

     

       
6
       
6
       
+
       
 	$(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"

     

       
7
       
7
       
+
       
-	test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"

     

       
8
       
8
       
+
       
-	test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLFILE) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/"

     

       
9
       
9
       
+
       
+	test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)"

     

       
10
       
10
       
+
       
+	test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLFILE) topfind "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/"

     

       
9
       
11
       
 
       
 	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config \

     

       
10
       
12
       
 
       
 	findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs \

     

       
11
       
13
       
 
       
 	findlib_config.cmi findlib_config.ml topfind.cmi topfind.mli \

     

       
12
       
12
       
-