Commit 24e0ade3 authored by Vincent Laporte's avatar Vincent Laporte Committed by Vincent Laporte
Browse files

ocamlPackages.findlib: 1.9.6 → 1.9.7

parent cf69fc27

pkgs/development/tools/ocaml/findlib/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


stdenv.mkDerivation rec {

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

  version = "1.9.6";

  version = "1.9.7";



  src = fetchurl {

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

    sha256 = "sha256-LfmWJ5rha2Bttf9Yefk9v63giY258aPoL3+EX6opMKI=";

    hash = "sha256-zNgiAI8bh6vVahL/f0rxlaDNouO8AROSF3miBcl5Hik=";

  };



  nativeBuildInputs = [ ocaml ];
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec { 


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



  postPatch = ''

    substituteInPlace src/bytes/Makefile --replace-warn OCAMLOPT_SHARED OCAMLOPT

  '';



  dontAddPrefix=true;

  dontAddStaticConfigureFlags = true;

  configurePlatforms = [];

pkgs/development/tools/ocaml/findlib/install_topfind.patch

+3 −3
Original line number Diff line number Diff line 
--- a/src/findlib/Makefile

+++ b/src/findlib/Makefile

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

@@ -134,8 +134,8 @@

 install: all

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

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

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

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

-	test $(INSTALL_TOPFIND) -eq 0 || $(CP) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/"

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

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

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

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

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

 	findlib_config.cmi findlib_config.ml topfind.cmi topfind.mli \