summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2022-07-30 18:54:04 -0500
committerGitHub <noreply@github.com>2022-07-30 18:54:04 -0500
commit6d1f689374e40db874f08ce5903298d1c14b2724 (patch)
tree3b6a575686ea3bbd9507cbc633b77d80aeb49edd
parenta255355f467ee02133df71e38d4cb1a3ea479165 (diff)
parentf8e9b39cdbd7aa125db88e60409022706147103b (diff)
downloadnixpkgs-6d1f689374e40db874f08ce5903298d1c14b2724.tar
nixpkgs-6d1f689374e40db874f08ce5903298d1c14b2724.tar.gz
nixpkgs-6d1f689374e40db874f08ce5903298d1c14b2724.tar.bz2
nixpkgs-6d1f689374e40db874f08ce5903298d1c14b2724.tar.lz
nixpkgs-6d1f689374e40db874f08ce5903298d1c14b2724.tar.xz
nixpkgs-6d1f689374e40db874f08ce5903298d1c14b2724.tar.zst
nixpkgs-6d1f689374e40db874f08ce5903298d1c14b2724.zip
Merge pull request #182808 from robx/postgresql-static-systemd
postgresql: disable systemd support for static builds
-rw-r--r--pkgs/servers/sql/postgresql/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 7c1ed8b6b37..83bdcec7397 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -4,14 +4,13 @@ let
       # dependencies
       { stdenv, lib, fetchurl, makeWrapper
       , glibc, zlib, readline, openssl, icu, lz4, systemd, libossp_uuid
-      , pkg-config, libxml2, tzdata
+      , pkg-config, libxml2, tzdata, libkrb5
 
       # This is important to obtain a version of `libpq` that does not depend on systemd.
-      , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin)
-      , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, libkrb5
+      , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin && !stdenv.hostPlatform.isStatic)
+      , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
 
-
-      # for postgreql.pkgs
+      # for postgresql.pkgs
       , this, self, newScope, buildEnv
 
       # source specification