diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 02:57:21 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 03:02:32 +0300 |
commit | 048a30e4e4930d91c167242e3268d4f21676716e (patch) | |
tree | 99dfc2f36533123f32edb37f9005231b801087db | |
parent | 47784e55e1c74e0d8e8c21fe2e6336c85b77706d (diff) | |
download | nixlib-048a30e4e4930d91c167242e3268d4f21676716e.tar nixlib-048a30e4e4930d91c167242e3268d4f21676716e.tar.gz nixlib-048a30e4e4930d91c167242e3268d4f21676716e.tar.bz2 nixlib-048a30e4e4930d91c167242e3268d4f21676716e.tar.lz nixlib-048a30e4e4930d91c167242e3268d4f21676716e.tar.xz nixlib-048a30e4e4930d91c167242e3268d4f21676716e.tar.zst nixlib-048a30e4e4930d91c167242e3268d4f21676716e.zip |
treewide: Fix dev references to libxml2
-rw-r--r-- | pkgs/applications/misc/pgadmin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/version-management/redmine/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/dns/bind/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/snapper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/clamav/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/modsecurity/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/xml/xmlstarlet/default.nix | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 1358e1f195a7..fba7b6371f67 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-libxml2=${libxml2}" + "--with-libxml2=${libxml2.dev}" "--with-libxslt=${libxslt.dev}" ]; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index b81808edc224..0cb498fec069 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { mkdir -p vendor/cache ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} - bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2}" + bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2.dev}" bundle install --verbose --local --deployment diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 8663c2632237..58f1ee6a3167 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-libtool" - "--with-libxml2=${libxml2}" + "--with-libxml2=${libxml2.dev}" "--with-openssl=${openssl.dev}" "--without-atf" "--without-dlopen" diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index faf79c29e778..5f482d68dd9a 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; NIX_CFLAGS_COMPILE = [ - "-I${libxml2}/include/libxml2" + "-I${libxml2.dev}/include/libxml2" ]; postInstall = '' diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 881362e4acb4..0cb34b2e73c9 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--with-zlib=${zlib.dev}" "--with-libbz2-prefix=${bzip2.dev}" "--with-iconv-dir=${libiconv}" - "--with-xml=${libxml2}" + "--with-xml=${libxml2.dev}" "--with-openssl=${openssl.dev}" "--with-libncurses-prefix=${ncurses.dev}" "--with-libcurl=${curl.dev}" diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 0b6900fb214d..a5e03eb3fe16 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-pcre=${pcre.dev}" "--with-apr=${apr.dev}" "--with-apu=${aprutil.dev}/bin/apu-1-config" - "--with-libxml=${libxml2}" + "--with-libxml=${libxml2.dev}" ]; outputs = ["out" "nginx"]; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 24303da40695..5ad62cd7140b 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' export LIBXSLT_PREFIX=${libxslt.dev} - export LIBXML_PREFIX=${libxml2} + export LIBXML_PREFIX=${libxml2.dev} export LIBXSLT_LIBS=$(pkg-config --libs libxslt libexslt) export LIBXML_LIBS=$(pkg-config --libs libxml-2.0) ''; |