nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages.findlib: 1.9.6 → 1.9.7

Browse Source
This commit is contained in:
Vincent Laporte 2024-11-06 21:14:44 +01:00 committed by Vincent Laporte
parent cf69fc271d
commit 24e0ade3a6
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/ocaml/findlib/default.nix
View File

@ -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 = [];

6
pkgs/development/tools/ocaml/findlib/install_topfind.patch
View File

@ -1,13 +1,13 @@
--- 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 \