about summary refs log tree commit diff
path: root/pkgs/servers/sql/postgresql/generic.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/servers/sql/postgresql/generic.nix')
-rw-r--r--pkgs/servers/sql/postgresql/generic.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index b7b2e3014ce4..46d2030224d8 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -10,7 +10,7 @@
 , walBlockSizeKB ? 8, walSegmentSizeMB ? 16
 
 # Version specific arguments
-, psqlSchema , version, src, patches ? [ ]
+, psqlSchema , version, src
 , ...
 }:
 
@@ -25,8 +25,6 @@ let
   optLibxml2 = shouldUsePkg libxml2;
   optLibxslt = shouldUsePkg libxslt;
   optZlib = shouldUsePkg zlib;
-
-  patches' = [ ./less-is-more.patch ] ++ patches;
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -34,7 +32,13 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
-  patches = patches';
+  patches = [
+    ./less-is-more.patch
+  ] ++ optionals (versionOlder version "9.4.0") [
+    ./disable-resolve_symlinks.patch
+  ] ++ optionals (versionAtLeast version "9.4.0") [
+    ./disable-resolve_symlinks-94.patch
+  ];
 
   nativeBuildInputs = [ bison flex ];
   buildInputs = [