git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #97045 from jtojnar/netpbm-10.91.2
commitb0f40bef4fa81cd0d348cf6b9e9706c4efb130f7 authorJan Tojnar <jtojnar@gmail.com> dateMon 5 Oct 2020, 22:25 (6 years ago) parent6fbd64646cf3b8
2 files changed+37−7
compare with master
unifiedsplit
pkgs/development/libraries/jbigkit/default.nix+13−3 pkgs/tools/graphics/netpbm/default.nix+24−4
pkgs/development/libraries/jbigkit/default.nix+13−3
@@ -8,15 +8,23 @@ stdenv.mkDerivation rec {
88 sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy";
99 };
1010
11+ makeFlags = [
12+ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
13+ "AR=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
14+ "RANLIB=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
15+ ];
16+
1117 postPatch = ''
1218 sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile
13− '' + stdenv.lib.optionalString stdenv.cc.isClang ''
19+
1420 for f in Makefile libjbig/Makefile pbmtools/Makefile; do
15− substituteInPlace $f --replace "CC = gcc" "CC = clang"
21+ sed -i -E 's/\bar /$(AR) /g;s/\branlib /$(RANLIB) /g' "$f"
1622 done
1723 '';
1824
1925 installPhase = ''
26+ runHook preInstall
27+
2028 install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a
2129 install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a
2230 install -D -m644 libjbig/jbig.h $out/include/jbig.h
@@ -30,12 +38,14 @@ stdenv.mkDerivation rec {
3038 install -D -m755 pbmtools/pbmtojbg $out/bin/pbmtojbg
3139 install -D -m755 pbmtools/jbgtopbm85 $out/bin/jbgtopbm85
3240 install -D -m755 pbmtools/pbmtojbg85 $out/bin/pbmtojbg85
41+
42+ runHook postInstall
3343 '';
3444
3545 meta = with stdenv.lib; {
3646 homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/";
3747 description = "A software implementation of the JBIG1 data compression standard";
38− license = licenses.gpl2;
48+ license = licenses.gpl2Plus;
3949 platforms = platforms.all;
4050 };
4151}
pkgs/tools/graphics/netpbm/default.nix+24−4
@@ -4,6 +4,7 @@
44, pkg-config
55, libjpeg
66, libpng
7+, jbigkit
78, flex
89, zlib
910, perl
@@ -12,19 +13,20 @@
1213, libtiff
1314, enableX11 ? false
1415, libX11
16+, buildPackages
1517}:
1618
1719stdenv.mkDerivation {
1820 # Determine version and revision from:
1921 # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
20− name = "netpbm-10.89.1";
22+ name = "netpbm-10.92.0";
2123
2224 outputs = [ "bin" "out" "dev" ];
2325
2426 src = fetchsvn {
2527 url = "https://svn.code.sf.net/p/netpbm/code/advanced";
26− rev = "3735";
27− sha256 = "1m7ks6k53gsjsdazgf22g16dfgj3pqvqy9mhxzlwszv5808sj5w5";
28+ rev = "3972";
29+ sha256 = "09fpy4n4f867j23pr3b719wpvp8hjrr4drxp0r1csw74p8j6vfy3";
2830 };
2931
3032 nativeBuildInputs = [
@@ -40,10 +42,17 @@ stdenv.mkDerivation {
4042 libjpeg
4143 libxml2
4244 libtiff
45+ jbigkit
4346 ] ++ lib.optional enableX11 libX11;
4447
48+
49+ strictDeps = true;
50+
4551 enableParallelBuilding = true;
4652
53+ # Environment variables
54+ STRIPPROG = "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip";
55+
4756 postPatch = ''
4857 # Install libnetpbm.so symlink to correct destination
4958 substituteInPlace lib/Makefile \
@@ -58,11 +67,22 @@ stdenv.mkDerivation {
5867 # Disable building static library
5968 echo "STATICLIB_TOO = N" >> config.mk
6069
70+ # Enable cross-compilation
71+ echo 'AR = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk
72+ echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk
73+ echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk
74+ echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk
75+ echo 'PKG_CONFIG = ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' >> config.mk
76+ echo 'RANLIB = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
77+
6178 # Use libraries from Nixpkgs
6279 echo "TIFFLIB = libtiff.so" >> config.mk
6380 echo "TIFFLIB_NEEDS_JPEG = N" >> config.mk
6481 echo "TIFFLIB_NEEDS_Z = N" >> config.mk
6582 echo "JPEGLIB = libjpeg.so" >> config.mk
83+ echo "JBIGLIB = libjbig.a" >> config.mk
84+ # Insecure
85+ echo "JASPERLIB = NONE" >> config.mk
6686
6787 # Fix path to rgb.txt
6888 echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk
@@ -70,7 +90,7 @@ stdenv.mkDerivation {
7090 echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
7191 echo "NETPBMLIBTYPE = dylib" >> config.mk
7292 echo "NETPBMLIBSUFFIX = dylib" >> config.mk
73−
93+ '' + ''
7494 runHook postConfigure
7595 '';
7696