diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-08-03 14:44:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 14:44:55 -0400 |
| commit | ebbd6f347179dd4417ac707111fe48211fac5063 (patch) | |
| tree | d64f0f46a836dfb070f22074b4cb6c45d5f90f89 | |
| parent | 57852282cf0ad4f3311c961d138304e48c95a2fa (diff) | |
| parent | f539c300954af9b71b3a49b541f1f6692840ca55 (diff) | |
| download | nixlib-ebbd6f347179dd4417ac707111fe48211fac5063.tar nixlib-ebbd6f347179dd4417ac707111fe48211fac5063.tar.gz nixlib-ebbd6f347179dd4417ac707111fe48211fac5063.tar.bz2 nixlib-ebbd6f347179dd4417ac707111fe48211fac5063.tar.lz nixlib-ebbd6f347179dd4417ac707111fe48211fac5063.tar.xz nixlib-ebbd6f347179dd4417ac707111fe48211fac5063.tar.zst nixlib-ebbd6f347179dd4417ac707111fe48211fac5063.zip | |
Merge pull request #44083 from dingxiangfei2009/cross-compiling-postgresql
Allow postgresql to cross compile
| -rw-r--r-- | pkgs/development/libraries/libossp-uuid/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libossp-uuid/shtool.patch | 11 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 10 |
3 files changed, 22 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index ddfc2a5132c7..952509acc2ee 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -10,7 +10,11 @@ stdenv.mkDerivation { sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; }; - configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + configureFlags = [ + "ac_cv_va_copy=yes" + ] ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + + patches = [ ./shtool.patch ]; meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; diff --git a/pkgs/development/libraries/libossp-uuid/shtool.patch b/pkgs/development/libraries/libossp-uuid/shtool.patch new file mode 100644 index 000000000000..f0c7cc485f50 --- /dev/null +++ b/pkgs/development/libraries/libossp-uuid/shtool.patch @@ -0,0 +1,11 @@ +--- a/shtool 2008-07-05 05:43:08.000000000 +0800 ++++ b/shtool 2018-07-25 15:45:40.559587471 +0800 +@@ -1400,7 +1400,7 @@ + if [ ".$opt_t" = .yes ]; then + echo "strip $dsttmp" 1>&2 + fi +- strip $dsttmp || shtool_exit $? ++ $STRIP $dsttmp || shtool_exit $? + fi + if [ ".$opt_o" != . ]; then + if [ ".$opt_t" = .yes ]; then diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a727b60dd9d4..4eb8d717309d 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 }: let @@ -22,14 +22,16 @@ let makeFlags = [ "world" ]; + NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + configureFlags = [ "--with-openssl" "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" - ] - ++ lib.optional (stdenv.isDarwin) "--with-uuid=e2fs" - ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; + "--with-system-tzdata=${tzdata}" + (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") + ]; patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) |