Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
@@ -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}" --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