treewide: Make explicit that 'dev' output of zlib is used
This commit is contained in:
parent
c4ffd14184
commit
7fb29bfa73
|
@ -45,7 +45,7 @@ let
|
||||||
--disable-keychain
|
--disable-keychain
|
||||||
${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"}
|
${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"}
|
||||||
${if httpSupport then "--with-serf=${serf}" else "--without-serf"}
|
${if httpSupport then "--with-serf=${serf}" else "--without-serf"}
|
||||||
--with-zlib=${zlib}
|
--with-zlib=${zlib.dev}
|
||||||
--with-sqlite=${sqlite.dev}
|
--with-sqlite=${sqlite.dev}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
gmp="${gmp.dev}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out"
|
gmp="${gmp.dev}" zlib="${zlib.dev}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -69,7 +69,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
zlib = {
|
zlib = {
|
||||||
configureFlags = ["--with-zlib=${zlib}"];
|
configureFlags = ["--with-zlib=${zlib.dev}"];
|
||||||
buildInputs = [zlib];
|
buildInputs = [zlib];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ let
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
(cd pixie-src
|
(cd pixie-src
|
||||||
patch -p1 < ${./load_paths.patch}
|
patch -p1 < ${./load_paths.patch}
|
||||||
libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib}"]'
|
libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]'
|
||||||
export libraryPaths
|
export libraryPaths
|
||||||
substituteAllInPlace ./pixie/ffi-infer.pxi)
|
substituteAllInPlace ./pixie/ffi-infer.pxi)
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -32,7 +32,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
|
||||||
"--with-jpeg=${libjpeg.dev}"
|
"--with-jpeg=${libjpeg.dev}"
|
||||||
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
|
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
|
||||||
"--with-libpng=${libpng.dev}" # optional
|
"--with-libpng=${libpng.dev}" # optional
|
||||||
"--with-libz=${zlib}" # optional
|
"--with-libz=${zlib.dev}" # optional
|
||||||
|
|
||||||
"--with-pg=${postgresql}/bin/pg_config"
|
"--with-pg=${postgresql}/bin/pg_config"
|
||||||
"--with-mysql=${mysql.lib}/bin/mysql_config"
|
"--with-mysql=${mysql.lib}/bin/mysql_config"
|
||||||
|
|
|
@ -27,7 +27,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
|
||||||
"--with-jpeg=${libjpeg.dev}"
|
"--with-jpeg=${libjpeg.dev}"
|
||||||
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
|
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
|
||||||
"--with-libpng=${libpng.dev}" # optional
|
"--with-libpng=${libpng.dev}" # optional
|
||||||
"--with-libz=${zlib}" # optional
|
"--with-libz=${zlib.dev}" # optional
|
||||||
|
|
||||||
"--with-pg=${postgresql}/bin/pg_config"
|
"--with-pg=${postgresql}/bin/pg_config"
|
||||||
"--with-mysql=${mysql.lib}/bin/mysql_config"
|
"--with-mysql=${mysql.lib}/bin/mysql_config"
|
||||||
|
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
scons PREFIX="$out" OPENSSL="${openssl.dev}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" \
|
scons PREFIX="$out" OPENSSL="${openssl.dev}" ZLIB="${zlib.dev}" APR="$(echo "${apr.dev}"/bin/*-config)" \
|
||||||
APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
|
APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
|
||||||
if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
|
if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
|
||||||
}" ${
|
}" ${
|
||||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||||
sed -i -e "s|/bin/ln|ln|" src/Makefile.in
|
sed -i -e "s|/bin/ln|ln|" src/Makefile.in
|
||||||
sed -i -e "s|-ltermcap|-lncurses|" ./configure
|
sed -i -e "s|-ltermcap|-lncurses|" ./configure
|
||||||
'';
|
'';
|
||||||
configureFlags = "--with-png=${libpng.dev} --with-z=${zlib} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
|
configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
|
||||||
buildInputs = [ pcre libpng zlib readline ];
|
buildInputs = [ pcre libpng zlib readline ];
|
||||||
propagatedBuildInputs = [ ncurses ];
|
propagatedBuildInputs = [ ncurses ];
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
||||||
substitute ${./META} META --subst-var-by VERSION "${version}"
|
substitute ${./META} META --subst-var-by VERSION "${version}"
|
||||||
substituteInPlace Makefile \
|
substituteInPlace Makefile \
|
||||||
--subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \
|
--subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \
|
||||||
--subst-var-by ZLIB_INCLUDE "${zlib}/include"
|
--subst-var-by ZLIB_INCLUDE "${zlib.dev}/include"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildFlags = "all allopt";
|
buildFlags = "all allopt";
|
||||||
|
|
|
@ -11,7 +11,7 @@ buildPerlPackage rec {
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
cat > config.in <<EOF
|
cat > config.in <<EOF
|
||||||
BUILD_ZLIB = False
|
BUILD_ZLIB = False
|
||||||
INCLUDE = ${zlib}/include
|
INCLUDE = ${zlib.dev}/include
|
||||||
LIB = ${zlib.out}/lib
|
LIB = ${zlib.out}/lib
|
||||||
OLD_ZLIB = False
|
OLD_ZLIB = False
|
||||||
GZIP_OS_CODE = AUTO_DETECT
|
GZIP_OS_CODE = AUTO_DETECT
|
||||||
|
|
|
@ -90,7 +90,7 @@ in
|
||||||
nokogiri = attrs: {
|
nokogiri = attrs: {
|
||||||
buildFlags = [
|
buildFlags = [
|
||||||
"--use-system-libraries"
|
"--use-system-libraries"
|
||||||
"--with-zlib-dir=${zlib}"
|
"--with-zlib-dir=${zlib.dev}"
|
||||||
"--with-xml2-lib=${libxml2.out}/lib"
|
"--with-xml2-lib=${libxml2.out}/lib"
|
||||||
"--with-xml2-include=${libxml2.dev}/include/libxml2"
|
"--with-xml2-include=${libxml2.dev}/include/libxml2"
|
||||||
"--with-xslt-lib=${libxslt.out}/lib"
|
"--with-xslt-lib=${libxslt.out}/lib"
|
||||||
|
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h";
|
NIX_CFLAGS_COMPILE="-include ${zlib.dev}/include/zlib.h";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir -p $out/share/naev
|
mkdir -p $out/share/naev
|
||||||
|
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||||
gettext intltool libtool perl
|
gettext intltool libtool perl
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlagsArray = ("CFLAGS=-include ${zlib}/include/zlib.h");
|
configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h");
|
||||||
|
|
||||||
patches = [ ./gcc-fix.patch ];
|
patches = [ ./gcc-fix.patch ];
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
|
||||||
rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec freetype cups/libs ijs
|
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@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
|
autoconf
|
||||||
'' + lib.optionalString cupsSupport ''
|
'' + lib.optionalString cupsSupport ''
|
||||||
|
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||||
configureFlags="$configureFlags --includedir=$dev/include"
|
configureFlags="$configureFlags --includedir=$dev/include"
|
||||||
'';
|
'';
|
||||||
configureFlags = ''
|
configureFlags = ''
|
||||||
--with-z=${zlib}
|
--with-z=${zlib.dev}
|
||||||
--with-pcre=${pcre.dev}
|
--with-pcre=${pcre.dev}
|
||||||
--enable-mods-shared=all
|
--enable-mods-shared=all
|
||||||
--enable-authn-alias
|
--enable-authn-alias
|
||||||
|
|
|
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||||
configureFlags = ''
|
configureFlags = ''
|
||||||
--with-apr=${apr.dev}
|
--with-apr=${apr.dev}
|
||||||
--with-apr-util=${aprutil.dev}
|
--with-apr-util=${aprutil.dev}
|
||||||
--with-z=${zlib}
|
--with-z=${zlib.dev}
|
||||||
--with-pcre=${pcre.dev}
|
--with-pcre=${pcre.dev}
|
||||||
--disable-maintainer-mode
|
--disable-maintainer-mode
|
||||||
--disable-debugger-mode
|
--disable-debugger-mode
|
||||||
|
|
|
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||||
++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
|
++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
|
||||||
++ optional (postgresql != null) "--with-postgresql=${postgresql}"
|
++ optional (postgresql != null) "--with-postgresql=${postgresql}"
|
||||||
++ optional (libmysql != null) "--with-mysql=${libmysql}"
|
++ optional (libmysql != null) "--with-mysql=${libmysql}"
|
||||||
++ optional (zlib != null) "--with-zlib=${zlib}"
|
++ optional (zlib != null) "--with-zlib=${zlib.dev}"
|
||||||
++ optional (lzo != null) "--with-lzo=${lzo}"
|
++ optional (lzo != null) "--with-lzo=${lzo}"
|
||||||
++ optional (jansson != null) "--with-jansson=${jansson}"
|
++ optional (jansson != null) "--with-jansson=${jansson}"
|
||||||
++ optional (acl != null) "--enable-acl"
|
++ optional (acl != null) "--enable-acl"
|
||||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ];
|
buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-zlib=${zlib}"
|
"--with-zlib=${zlib.dev}"
|
||||||
"--with-libbz2-prefix=${bzip2.dev}"
|
"--with-libbz2-prefix=${bzip2.dev}"
|
||||||
"--with-iconv-dir=${libiconv}"
|
"--with-iconv-dir=${libiconv}"
|
||||||
"--with-xml=${libxml2}"
|
"--with-xml=${libxml2}"
|
||||||
|
|
|
@ -45,7 +45,7 @@ let
|
||||||
|
|
||||||
sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic";
|
sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic";
|
||||||
|
|
||||||
configureFlags = "--with-zlib-dir=${pkgs.zlib}";
|
configureFlags = "--with-zlib-dir=${pkgs.zlib.dev}";
|
||||||
};
|
};
|
||||||
|
|
||||||
memcached = if isPhp7 then memcachedPhp7 else memcached22;
|
memcached = if isPhp7 then memcachedPhp7 else memcached22;
|
||||||
|
@ -56,7 +56,7 @@ let
|
||||||
sha256 = "0n4z2mp4rvrbmxq079zdsrhjxjkmhz6mzi7mlcipz02cdl7n1f8p";
|
sha256 = "0n4z2mp4rvrbmxq079zdsrhjxjkmhz6mzi7mlcipz02cdl7n1f8p";
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-zlib-dir=${pkgs.zlib}"
|
"--with-zlib-dir=${pkgs.zlib.dev}"
|
||||||
"--with-libmemcached-dir=${pkgs.libmemcached}"
|
"--with-libmemcached-dir=${pkgs.libmemcached}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-zlib-dir=${pkgs.zlib}"
|
"--with-zlib-dir=${pkgs.zlib.dev}"
|
||||||
"--with-libmemcached-dir=${pkgs.libmemcached}"
|
"--with-libmemcached-dir=${pkgs.libmemcached}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue