diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-13 18:53:30 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-13 23:12:59 -0700 |
| commit | 76c58493d78d5f06ed62e0b8309f223232dfc309 (patch) | |
| tree | 2ebb2f1cb9520af0e937ec2d430e0f4d10ff08ee | |
| parent | d01a4e3fe99cdc9f4015e741edfd3c77a5d90a37 (diff) | |
| download | nixpkgs-76c58493d78d5f06ed62e0b8309f223232dfc309.tar nixpkgs-76c58493d78d5f06ed62e0b8309f223232dfc309.tar.gz nixpkgs-76c58493d78d5f06ed62e0b8309f223232dfc309.tar.bz2 nixpkgs-76c58493d78d5f06ed62e0b8309f223232dfc309.tar.lz nixpkgs-76c58493d78d5f06ed62e0b8309f223232dfc309.tar.xz nixpkgs-76c58493d78d5f06ed62e0b8309f223232dfc309.tar.zst nixpkgs-76c58493d78d5f06ed62e0b8309f223232dfc309.zip | |
libxslt: find libxml2 using pkg-config
It fails for reasons unknown otherwise and pkg-config is better for cross-compilation anyway.
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 650e17d3179..eb23e16d653 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python3, libgcrypt +{ lib, stdenv, fetchurl +, pkg-config +, libxml2, findXMLCatalogs, gettext, python3, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: @@ -14,6 +16,10 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ libxml2.dev ] ++ lib.optional stdenv.isDarwin gettext ++ lib.optionals pythonSupport [ libxml2.py python3 ] @@ -22,7 +28,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs ]; configureFlags = [ - "--with-libxml-prefix=${libxml2.dev}" "--without-debug" "--without-mem-debug" "--without-debugger" |