diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:40:27 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:48 +0200 |
| commit | 3672f3edcb35fc91669703cdeeac628820702f97 (patch) | |
| tree | 7e6e18f21223d58db3e49b80f9eeec0e6fbe6255 | |
| parent | 9d5ba6ba68a5693244a8c29cade0fb2dd3ada050 (diff) | |
| download | nixlib-3672f3edcb35fc91669703cdeeac628820702f97.tar nixlib-3672f3edcb35fc91669703cdeeac628820702f97.tar.gz nixlib-3672f3edcb35fc91669703cdeeac628820702f97.tar.bz2 nixlib-3672f3edcb35fc91669703cdeeac628820702f97.tar.lz nixlib-3672f3edcb35fc91669703cdeeac628820702f97.tar.xz nixlib-3672f3edcb35fc91669703cdeeac628820702f97.tar.zst nixlib-3672f3edcb35fc91669703cdeeac628820702f97.zip | |
treewide: Make explicit that 'dev' output of libxslt is used
| -rw-r--r-- | pkgs/applications/version-management/redmine/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/xml/xmlstarlet/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 3a8df10f1661..7590ae743a37 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -45,7 +45,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}" --with-xml2-dir="${libxml2}" + bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2}" bundle install --verbose --local --deployment diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3e111b3538d1..54f90d7b5952 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -177,7 +177,7 @@ let }; xsl = { - configureFlags = ["--with-xsl=${libxslt}"]; + configureFlags = ["--with-xsl=${libxslt.dev}"]; buildInputs = [libxslt]; }; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 74f7e08900a7..b390a9c404a3 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export LIBXSLT_PREFIX=${libxslt} + export LIBXSLT_PREFIX=${libxslt.dev} export LIBXML_PREFIX=${libxml2} export LIBXSLT_LIBS=$(pkg-config --libs libxslt libexslt) export LIBXML_LIBS=$(pkg-config --libs libxml-2.0) |