diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 13:23:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 13:44:16 +0200 |
| commit | 38313d5d877fc421d1381971051107e4b03dc40d (patch) | |
| tree | 8143c1a0d11cd8d0cf10fe59a67508baa975ffba /pkgs/development/interpreters | |
| parent | f8c211fd2b53d970a439d643bea9d0928fb08666 (diff) | |
| download | nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.gz nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.bz2 nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.lz nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.xz nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.zst nixlib-38313d5d877fc421d1381971051107e4b03dc40d.zip | |
libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully. libxml2Python is slightly hacky now, but it seems to work.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patches.nix | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 59630d1814fa..6247663e3f40 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -67,7 +67,7 @@ let libxml2 = { configureFlags = [ - "--with-libxml-dir=${libxml2}" + "--with-libxml-dir=${libxml2.dev}" ]; buildInputs = [ libxml2 ]; }; diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index 3ae74057a54f..c91c6da28d9f 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -63,12 +63,12 @@ in buildFlags = [ "--use-system-libraries" "--with-zlib-dir=${zlib}" - "--with-xml2-lib=${libxml2}/lib" - "--with-xml2-include=${libxml2}/include/libxml2" - "--with-xslt-lib=${libxslt}/lib" - "--with-xslt-include=${libxslt}/include" - "--with-exslt-lib=${libxslt}/lib" - "--with-exslt-include=${libxslt}/include" + "--with-xml2-lib=${libxml2.out}/lib" + "--with-xml2-include=${libxml2.dev}/include/libxml2" + "--with-xslt-lib=${libxslt.out}/lib" + "--with-xslt-include=${libxslt.dev}/include" + "--with-exslt-lib=${libxslt.out}/lib" + "--with-exslt-include=${libxslt.dev}/include" ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; }; diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 0cc477c991ef..be79c5c957ab 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -82,8 +82,8 @@ in nokogiri = { buildInputs = [ libxml2 ]; buildFlags = - [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" - "--with-xslt-dir=${libxslt} --use-system-libraries" + [ "--with-xml2-dir=${libxml2.out} --with-xml2-include=${libxml2.dev}/include/libxml2" + "--with-xslt-dir=${libxslt.out} --use-system-libraries" libiconv ]; }; |