JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:45:26 +03:00 committed by Vladimír Čunát
parent 5152e01e87
commit d42e94472d
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/slang/default.nix
View File

@ -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} --with-readline=${readline}"; configureFlags = "--with-png=${libpng.dev} --with-z=${zlib} --with-pcre=${pcre.dev} --with-readline=${readline}";
buildInputs = [ pcre libpng zlib readline ]; buildInputs = [ pcre libpng zlib readline ];
propagatedBuildInputs = [ ncurses ]; propagatedBuildInputs = [ ncurses ];

2
pkgs/servers/http/apache-httpd/2.2.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = '' configureFlags = ''
--with-z=${zlib} --with-z=${zlib}
--with-pcre=${pcre} --with-pcre=${pcre.dev}
--enable-mods-shared=all --enable-mods-shared=all
--enable-authn-alias --enable-authn-alias
${if proxySupport then "--enable-proxy" else ""} ${if proxySupport then "--enable-proxy" else ""}

2
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
--with-apr=${apr.dev} --with-apr=${apr.dev}
--with-apr-util=${aprutil.dev} --with-apr-util=${aprutil.dev}
--with-z=${zlib} --with-z=${zlib}
--with-pcre=${pcre} --with-pcre=${pcre.dev}
--disable-maintainer-mode --disable-maintainer-mode
--disable-debugger-mode --disable-debugger-mode
--enable-mods-shared=all --enable-mods-shared=all

2
pkgs/tools/security/clamav/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
"--with-openssl=${openssl.dev}" "--with-openssl=${openssl.dev}"
"--with-libncurses-prefix=${ncurses.dev}" "--with-libncurses-prefix=${ncurses.dev}"
"--with-libcurl=${curl.dev}" "--with-libcurl=${curl.dev}"
"--with-pcre=${pcre}" "--with-pcre=${pcre.dev}"
"--enable-milter" "--enable-milter"
"--disable-clamav" "--disable-clamav"
]; ];

2
pkgs/tools/security/modsecurity/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"--enable-static" "--enable-static"
"--with-curl=${curl.dev}" "--with-curl=${curl.dev}"
"--with-apxs=${apacheHttpd.dev}/bin/apxs" "--with-apxs=${apacheHttpd.dev}/bin/apxs"
"--with-pcre=${pcre}" "--with-pcre=${pcre.dev}"
"--with-apr=${apr.dev}" "--with-apr=${apr.dev}"
"--with-apu=${aprutil.dev}/bin/apu-1-config" "--with-apu=${aprutil.dev}/bin/apu-1-config"
"--with-libxml=${libxml2}" "--with-libxml=${libxml2}"

2
pkgs/top-level/lua-packages.nix
View File

@ -271,7 +271,7 @@ let
buildPhase = let buildPhase = let
luaVariable = "LUA_PATH=${luastdlib}/share/lua/${lua.luaversion}/?.lua"; luaVariable = "LUA_PATH=${luastdlib}/share/lua/${lua.luaversion}/?.lua";
pcreVariable = "PCRE_DIR=${pcre}"; pcreVariable = "PCRE_DIR=${pcre.dev}";
onigVariable = "ONIG_DIR=${oniguruma}"; onigVariable = "ONIG_DIR=${oniguruma}";
gnuVariable = "GNU_INCDIR=${gnulib}/lib"; gnuVariable = "GNU_INCDIR=${gnulib}/lib";
treVariable = "TRE_DIR=${tre}"; treVariable = "TRE_DIR=${tre}";