From b2104d93ff319e26a036b1d5afe8d57322c536be Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Fri, 27 Jul 2018 14:12:25 +0800 Subject: [PATCH] point to the right libxml2 header folder --- pkgs/servers/sql/postgresql/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e558e7ee5ae..81eb2f29ef9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -14,21 +14,17 @@ let outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ - combinedLibXML2 = symlinkJoin { - name = "libxml2-combined"; - paths = [ libxml2 libxml2.dev ]; - }; - - nativeBuildInputs = [ combinedLibXML2 ]; - buildInputs = - [ zlib readline openssl makeWrapper ] + [ zlib readline openssl makeWrapper libxml2 ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; makeFlags = [ "world" ]; + preConfigure = '' + export CFLAGS="$CFLAGS -I${libxml2.dev}/include/libxml2" + ''; configureFlags = [ "--with-openssl" "--with-libxml"