From c0ca3e36d61f53c80ae5683ecc139689720cb3ac Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Mon, 30 Jul 2018 15:47:10 +0800 Subject: [PATCH] be explicit on choice of uuid library --- pkgs/servers/sql/postgresql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a81e2fb2c8f..fafb5bfeb92 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -31,9 +31,9 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}" - ] - ++ lib.optional stdenv.isDarwin "--with-uuid=e2fs" - ++ lib.optional (!stdenv.isDarwin) "--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)