diff options
| author | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-25 16:32:42 +0800 |
|---|---|---|
| committer | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-25 16:32:42 +0800 |
| commit | 5c7cfbc0f11e360f50467b20a407c675c976d3a0 (patch) | |
| tree | 7aa06d0070426e8ce9aeb61218e50fc27a2bb94d /pkgs/servers/sql | |
| parent | b619e0b016c5c79920aa06b78ccf936e56eaf45d (diff) | |
| download | nixlib-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar nixlib-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.gz nixlib-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.bz2 nixlib-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.lz nixlib-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.xz nixlib-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.zst nixlib-5c7cfbc0f11e360f50467b20a407c675c976d3a0.zip | |
allow postgresql cross compiling
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a727b60dd9d4..e558e7ee5aed 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, libxml2, makeWrapper }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, symlinkJoin }: let @@ -14,8 +14,15 @@ 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 libxml2 makeWrapper ] + [ zlib readline openssl makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; @@ -28,8 +35,9 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" ] - ++ lib.optional (stdenv.isDarwin) "--with-uuid=e2fs" - ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; + ++ lib.optional stdenv.isDarwin "--with-uuid=e2fs" + ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid" + ++ lib.optional stdenv.isCross "--with-system-tzdata=${tzdata}"; patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) |