From d509c583fc217ea24b3bf41be757f287854a8f23 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Sep 2020 20:10:36 +0200 Subject: jbigkit: fix cross-compilation --- pkgs/development/libraries/jbigkit/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index dbf728e7d82..c21d51bc5a7 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -8,15 +8,23 @@ stdenv.mkDerivation rec { sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; + makeFlags = [ + "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + "RANLIB=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + ]; + postPatch = '' sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile - '' + stdenv.lib.optionalString stdenv.cc.isClang '' + for f in Makefile libjbig/Makefile pbmtools/Makefile; do - substituteInPlace $f --replace "CC = gcc" "CC = clang" + sed -i -E 's/\bar /$(AR) /g;s/\branlib /$(RANLIB) /g' "$f" done ''; installPhase = '' + runHook preInstall + install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a install -D -m644 libjbig/jbig.h $out/include/jbig.h @@ -30,12 +38,14 @@ stdenv.mkDerivation rec { install -D -m755 pbmtools/pbmtojbg $out/bin/pbmtojbg install -D -m755 pbmtools/jbgtopbm85 $out/bin/jbgtopbm85 install -D -m755 pbmtools/pbmtojbg85 $out/bin/pbmtojbg85 + + runHook postInstall ''; meta = with stdenv.lib; { homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; description = "A software implementation of the JBIG1 data compression standard"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; }; } -- cgit 1.4.1