diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-02 16:22:42 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-02 18:48:06 -0400 |
commit | f539c300954af9b71b3a49b541f1f6692840ca55 (patch) | |
tree | da6b1b7d5076aee974bf8c0885752aad208f4c17 | |
parent | 40c2bf6e42c342a78a32399e9391513cba8522e4 (diff) | |
download | nixlib-f539c300954af9b71b3a49b541f1f6692840ca55.tar nixlib-f539c300954af9b71b3a49b541f1f6692840ca55.tar.gz nixlib-f539c300954af9b71b3a49b541f1f6692840ca55.tar.bz2 nixlib-f539c300954af9b71b3a49b541f1f6692840ca55.tar.lz nixlib-f539c300954af9b71b3a49b541f1f6692840ca55.tar.xz nixlib-f539c300954af9b71b3a49b541f1f6692840ca55.tar.zst nixlib-f539c300954af9b71b3a49b541f1f6692840ca55.zip |
postgresql: Fix nits after cross fixes
-rw-r--r-- | pkgs/development/libraries/libossp-uuid/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index fc727f39238f..952509acc2ee 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -10,14 +10,12 @@ 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 ]; - 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"; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index f4aabb971a6d..4eb8d717309d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -30,9 +30,8 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--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 = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) |