mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
camlzip: 1.06 -> 1.07
Fixes bug with modern zlib and large files
This commit is contained in:
parent
5dda5a2ea2
commit
b4716ea7a2
|
@ -4,16 +4,17 @@ let
|
||||||
param =
|
param =
|
||||||
if stdenv.lib.versionAtLeast ocaml.version "4.02"
|
if stdenv.lib.versionAtLeast ocaml.version "4.02"
|
||||||
then {
|
then {
|
||||||
version = "1.06";
|
version = "1.07";
|
||||||
url = "1616";
|
url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz";
|
||||||
sha256 = "0m6gyjw46w3qnhxfsyqyag42znl5lwargks7w7rfchr9jzwpff68";
|
sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g";
|
||||||
patch = ./makefile_1_06.patch;
|
patches = [];
|
||||||
installTargets = "install-findlib";
|
installTargets = "install-findlib";
|
||||||
} else {
|
} else {
|
||||||
version = "1.05";
|
version = "1.05";
|
||||||
url = "1037";
|
download_id = "1037";
|
||||||
|
url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz";
|
||||||
sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b";
|
sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b";
|
||||||
patch = ./makefile_1_05.patch;
|
patches = [./makefile_1_05.patch];
|
||||||
installTargets = "install";
|
installTargets = "install";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
@ -22,13 +23,15 @@ stdenv.mkDerivation {
|
||||||
name = "camlzip-${param.version}";
|
name = "camlzip-${param.version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://forge.ocamlcore.org/frs/download.php/${param.url}/camlzip-${param.version}.tar.gz";
|
inherit (param) url;
|
||||||
inherit (param) sha256;
|
inherit (param) sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [zlib ocaml findlib];
|
buildInputs = [ocaml findlib];
|
||||||
|
|
||||||
patches = [ param.patch ];
|
propagatedBuildInputs = [zlib];
|
||||||
|
|
||||||
|
inherit (param) patches;
|
||||||
|
|
||||||
createFindlibDestdir = true;
|
createFindlibDestdir = true;
|
||||||
|
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
--- a/Makefile 2016-06-10 14:37:48.000000000 +0200
|
|
||||||
+++ b/Makefile 2016-06-23 05:10:26.000000000 +0200
|
|
||||||
@@ -4,17 +4,13 @@
|
|
||||||
ZLIB_LIB=-lz
|
|
||||||
|
|
||||||
# The directory containing the Zlib library (libz.a or libz.so)
|
|
||||||
-ZLIB_LIBDIR=/usr/lib
|
|
||||||
+ZLIB_LIBDIR=@ZLIB_LIBDIR@
|
|
||||||
# ZLIB_LIBDIR=/usr/local/lib
|
|
||||||
|
|
||||||
# The directory containing the Zlib header file (zlib.h)
|
|
||||||
-ZLIB_INCLUDE=/usr/include
|
|
||||||
+ZLIB_INCLUDE=@ZLIB_INCLUDE@
|
|
||||||
# ZLIB_INCLUDE=/usr/local/include
|
|
||||||
|
|
||||||
-# Where to install the library. By default: sub-directory 'zip' of
|
|
||||||
-# OCaml's standard library directory.
|
|
||||||
-INSTALLDIR=`$(OCAMLC) -where`/zip
|
|
||||||
-
|
|
||||||
### End of configuration section
|
|
||||||
|
|
||||||
OCAMLC=ocamlc -g -safe-string
|
|
Loading…
Reference in a new issue