treewide: Make explicit that 'dev' output of zlib is used

This commit is contained in:
Tuomas Tynkkynen
2016-04-16 20:50:01 +03:00
committed by Vladimír Čunát
parent c4ffd14184
commit 7fb29bfa73
19 changed files with 21 additions and 21 deletions

View File

@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec freetype cups/libs ijs
sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak
sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib}/include@" -i configure.ac
sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac
autoconf
'' + lib.optionalString cupsSupport ''