dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #267393 from arnarg/postgresql-enable-pam

Browse Source 
postgresql: add pam support on linux
This commit is contained in:
Maximilian Bosch 2023-12-13 22:32:12 +01:00 committed by GitHub
commit 16ccd41a11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ let
{ stdenv, lib, fetchurl, makeWrapper, fetchpatch { stdenv, lib, fetchurl, makeWrapper, fetchpatch
, glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid , glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid
, pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin
, linux-pam
# This is important to obtain a version of `libpq` that does not depend on systemd. # This is important to obtain a version of `libpq` that does not depend on systemd.
, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic
@ -63,6 +64,7 @@ let
++ lib.optionals zstdEnabled [ zstd ] ++ lib.optionals zstdEnabled [ zstd ]
++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals enableSystemd [ systemd ]
++ lib.optionals gssSupport [ libkrb5 ] ++ lib.optionals gssSupport [ libkrb5 ]
++ lib.optionals stdenv'.isLinux [ linux-pam ]
++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ]; ++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -96,7 +98,8 @@ let
++ lib.optionals zstdEnabled [ "--with-zstd" ] ++ lib.optionals zstdEnabled [ "--with-zstd" ]
++ lib.optionals gssSupport [ "--with-gssapi" ] ++ lib.optionals gssSupport [ "--with-gssapi" ]
++ lib.optionals stdenv'.hostPlatform.isRiscV [ "--disable-spinlocks" ] ++ lib.optionals stdenv'.hostPlatform.isRiscV [ "--disable-spinlocks" ]
++ lib.optionals jitSupport [ "--with-llvm" ]; ++ lib.optionals jitSupport [ "--with-llvm" ]
++ lib.optionals stdenv'.isLinux [ "--with-pam" ];
patches = [ patches = [
(if atLeast "16" then ./patches/disable-normalize_exec_path.patch (if atLeast "16" then ./patches/disable-normalize_exec_path.patch