From d42e94472db40583c78a31e5673353d4d6c3aa2a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 16 Apr 2016 20:45:26 +0300
Subject: treewide: Make explicit that 'dev' output of pcre is used

---
 pkgs/development/libraries/slang/default.nix | 2 +-
 pkgs/servers/http/apache-httpd/2.2.nix       | 2 +-
 pkgs/servers/http/apache-httpd/2.4.nix       | 2 +-
 pkgs/tools/security/clamav/default.nix       | 2 +-
 pkgs/tools/security/modsecurity/default.nix  | 2 +-
 pkgs/top-level/lua-packages.nix              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index 70f7270f1b8f..c86c196a09d2 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -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 ];
 
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 5e386cbe008f..62695de61c65 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -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 ""}
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 0ce0130c90ab..4c9924c33401 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -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
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index be6db9f5a25a..3921251e4e35 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -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"
   ];
diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix
index e82d34cb9ae6..0b6900fb214d 100644
--- a/pkgs/tools/security/modsecurity/default.nix
+++ b/pkgs/tools/security/modsecurity/default.nix
@@ -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}"
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index abd4a8123416..980c0aca6332 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -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}";
-- 
cgit 1.4.1