git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #60392 from dtzWill/update/leptonica-1.78.0

leptonica: 1.74.1 -> 1.78.0

commit651342628ea90e10f8477e863442dec5d7a1cdd3 authorRenaud <c0bw3b@users.noreply.github.com> dateFri 10 May 2019, 17:57 (8 years ago) parentd02d55d5149226
1 file changed+2−22
pkgs/development/libraries/leptonica/default.nix+2−22
pkgs/development/libraries/leptonica/default.nix+2−22
@@ -4,33 +4,13 @@
44
55stdenv.mkDerivation rec {
66 name = "leptonica-${version}";
7− version = "1.74.1";
7+ version = "1.78.0";
88
99 src = fetchurl {
1010 url = "http://www.leptonica.org/source/${name}.tar.gz";
11− sha256 = "0qpcidvv6igybrrhj0m6j47g642c8sk1qn4dpj82mgd38xx52skl";
11+ sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2";
1212 };
1313
14− patches = stdenv.lib.singleton (fetchpatch {
15− # configure: Support pkg-config
16− url = "https://github.com/DanBloomberg/leptonica/commit/"
17− + "4476d162cc191a0fefb2ce434153e12bbf188664.patch";
18− sha256 = "1razzp2g49shfaravfqpxm3ivcd1r92lvqysll6nnf6d1wp9865s";
19− });
20−
21− postPatch = ''
22− # Remove the AC_SUBST() macros on *_LIBS, because the *_LIBS variables will
23− # be automatically set by PKG_CHECK_MODULES() since autotools 0.24 and
24− # using the ones that are set here in Leptonica's configure.ac do not
25− # include -L linker flags.
26− sed -i -e '/PKG_CHECK_MODULES/,/^ *\])/s/AC_SUBST([^)]*)//' configure.ac
27−
28− # The giflib package doesn't ship a pkg-config file, so we need to inject
29− # the linker search path.
30− substituteInPlace configure.ac --replace -lgif \
31− ${stdenv.lib.escapeShellArg "'-L${giflib}/lib -lgif'"}
32− '';
33−
3414 nativeBuildInputs = [ autoreconfHook pkgconfig ];
3515 buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ];
3616