allow postgresql cross compiling

This commit is contained in:
Ding Xiang Fei 2018-07-25 16:32:42 +08:00
parent b619e0b016
commit 5c7cfbc0f1
3 changed files with 30 additions and 5 deletions

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, buildPackages}:
let version = "1.6.2"; in
@ -12,6 +12,12 @@ stdenv.mkDerivation {
configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
patches = [ ./shtool.patch ];
preConfigure = ''
export ac_cv_va_copy=yes
'';
meta = with stdenv.lib; {
homepage = http://www.ossp.org/pkg/lib/uuid/;
description = "OSSP uuid ISO-C and C++ shared library";

View File

@ -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

View File

@ -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)