alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

postgresql: Fix nits after cross fixes

Browse source
This commit is contained in:
John Ericson 2018-08-02 16:22:42 -04:00
parent 40c2bf6e42
commit f539c30095
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/libossp-uuid/default.nix
View file

@ -10,14 +10,12 @@ stdenv.mkDerivation {
sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; 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 ]; patches = [ ./shtool.patch ];
preConfigure = ''
export ac_cv_va_copy=yes
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.ossp.org/pkg/lib/uuid/; homepage = http://www.ossp.org/pkg/lib/uuid/;
description = "OSSP uuid ISO-C and C++ shared library"; description = "OSSP uuid ISO-C and C++ shared library";

5
pkgs/servers/sql/postgresql/default.nix
View file

@ -30,9 +30,8 @@ let
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--libdir=$(lib)/lib" "--libdir=$(lib)/lib"
"--with-system-tzdata=${tzdata}" "--with-system-tzdata=${tzdata}"
] ++ ( (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid")
if stdenv.isDarwin then [ "--with-uuid=e2fs" ] else [ "--with-ossp-uuid" ] ];
);
patches = patches =
[ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)