treewide: Make explicit that 'dev' output of pcre is used
This commit is contained in:
parent
5152e01e87
commit
d42e94472d
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i -e "s|/bin/ln|ln|" src/Makefile.in
|
||||
sed -i -e "s|-ltermcap|-lncurses|" ./configure
|
||||
'';
|
||||
configureFlags = "--with-png=${libpng.dev} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}";
|
||||
configureFlags = "--with-png=${libpng.dev} --with-z=${zlib} --with-pcre=${pcre.dev} --with-readline=${readline}";
|
||||
buildInputs = [ pcre libpng zlib readline ];
|
||||
propagatedBuildInputs = [ ncurses ];
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
configureFlags = ''
|
||||
--with-z=${zlib}
|
||||
--with-pcre=${pcre}
|
||||
--with-pcre=${pcre.dev}
|
||||
--enable-mods-shared=all
|
||||
--enable-authn-alias
|
||||
${if proxySupport then "--enable-proxy" else ""}
|
||||
|
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
--with-apr=${apr.dev}
|
||||
--with-apr-util=${aprutil.dev}
|
||||
--with-z=${zlib}
|
||||
--with-pcre=${pcre}
|
||||
--with-pcre=${pcre.dev}
|
||||
--disable-maintainer-mode
|
||||
--disable-debugger-mode
|
||||
--enable-mods-shared=all
|
||||
|
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
"--with-openssl=${openssl.dev}"
|
||||
"--with-libncurses-prefix=${ncurses.dev}"
|
||||
"--with-libcurl=${curl.dev}"
|
||||
"--with-pcre=${pcre}"
|
||||
"--with-pcre=${pcre.dev}"
|
||||
"--enable-milter"
|
||||
"--disable-clamav"
|
||||
];
|
||||
|
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-static"
|
||||
"--with-curl=${curl.dev}"
|
||||
"--with-apxs=${apacheHttpd.dev}/bin/apxs"
|
||||
"--with-pcre=${pcre}"
|
||||
"--with-pcre=${pcre.dev}"
|
||||
"--with-apr=${apr.dev}"
|
||||
"--with-apu=${aprutil.dev}/bin/apu-1-config"
|
||||
"--with-libxml=${libxml2}"
|
||||
|
|
|
@ -271,7 +271,7 @@ let
|
|||
buildPhase = let
|
||||
luaVariable = "LUA_PATH=${luastdlib}/share/lua/${lua.luaversion}/?.lua";
|
||||
|
||||
pcreVariable = "PCRE_DIR=${pcre}";
|
||||
pcreVariable = "PCRE_DIR=${pcre.dev}";
|
||||
onigVariable = "ONIG_DIR=${oniguruma}";
|
||||
gnuVariable = "GNU_INCDIR=${gnulib}/lib";
|
||||
treVariable = "TRE_DIR=${tre}";
|
||||
|
|
Loading…
Reference in a new issue