diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-07-20 20:31:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-20 20:31:38 +0200 |
commit | 226964861f10622f89ba74a9fea9b4ca6a64d8d3 (patch) | |
tree | 4ab2426e5eb8fef6174e268d7a3f5c9fae84570d /pkgs/servers/sql | |
parent | 00b6ac7bd3f6909674a80b0c02ddf48afd415608 (diff) | |
parent | 0b027720af00264b142e1ecade0e4fb576889909 (diff) | |
download | nixlib-226964861f10622f89ba74a9fea9b4ca6a64d8d3.tar nixlib-226964861f10622f89ba74a9fea9b4ca6a64d8d3.tar.gz nixlib-226964861f10622f89ba74a9fea9b4ca6a64d8d3.tar.bz2 nixlib-226964861f10622f89ba74a9fea9b4ca6a64d8d3.tar.lz nixlib-226964861f10622f89ba74a9fea9b4ca6a64d8d3.tar.xz nixlib-226964861f10622f89ba74a9fea9b4ca6a64d8d3.tar.zst nixlib-226964861f10622f89ba74a9fea9b4ca6a64d8d3.zip |
Merge pull request #27405 from rvl/postgresql-xml
postgresql: fix nixos tests and add xml support
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 28f916935755..b9c940a01cdf 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, makeWrapper }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper }: let @@ -15,7 +15,7 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl makeWrapper ] + [ zlib readline openssl libxml2 makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; @@ -24,6 +24,7 @@ let configureFlags = [ "--with-openssl" + "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" ] |