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

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:40:27 +03:00 committed by Vladimír Čunát
parent 9d5ba6ba68
commit 3672f3edcb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/redmine/default.nix
View File

@ -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

2
pkgs/development/interpreters/php/default.nix
View File

@ -177,7 +177,7 @@ let
};
xsl = {
configureFlags = ["--with-xsl=${libxslt}"];
configureFlags = ["--with-xsl=${libxslt.dev}"];
buildInputs = [libxslt];
};

2
pkgs/tools/text/xml/xmlstarlet/default.nix
View File

@ -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)