committed by
Wolfgang Walther
parent
dcb6c5bb13
commit
c94aa9ccd9
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- #3149, Misleading "Starting PostgREST.." logs on schema cache reloading - @steve-chavez
|
- #3149, Misleading "Starting PostgREST.." logs on schema cache reloading - @steve-chavez
|
||||||
|
- #2815, Build static executable with GSSAPI support - @wolfgangwalther
|
||||||
|
|
||||||
### Deprecated
|
### Deprecated
|
||||||
|
|
||||||
|
|||||||
+8
-1
@@ -25,12 +25,13 @@ stdenv.mkDerivation {
|
|||||||
"--without-gssapi"
|
"--without-gssapi"
|
||||||
"--without-icu"
|
"--without-icu"
|
||||||
"--without-readline"
|
"--without-readline"
|
||||||
|
"--with-gssapi"
|
||||||
"--with-openssl"
|
"--with-openssl"
|
||||||
"--with-system-tzdata=${tzdata}/share/zoneinfo"
|
"--with-system-tzdata=${tzdata}/share/zoneinfo"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config tzdata ];
|
nativeBuildInputs = [ pkg-config tzdata ];
|
||||||
buildInputs = [ openssl zlib ];
|
buildInputs = [ libkrb5 openssl zlib ];
|
||||||
|
|
||||||
buildFlags = [ "submake-libpq" "submake-libpgport" ];
|
buildFlags = [ "submake-libpq" "submake-libpgport" ];
|
||||||
|
|
||||||
@@ -48,6 +49,12 @@ stdenv.mkDerivation {
|
|||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# To avoid linking errors in the static build with gssapi
|
||||||
|
postInstall = ''
|
||||||
|
substituteInPlace $out/lib/pkgconfig/libpq.pc\
|
||||||
|
--replace "Requires.private:" "Requires.private: krb5-gssapi,"
|
||||||
|
'';
|
||||||
|
|
||||||
outputs = [ "out" ];
|
outputs = [ "out" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|||||||
+5
-2
@@ -36,8 +36,11 @@ let
|
|||||||
# static libs for libpq.
|
# static libs for libpq.
|
||||||
nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [ pkgs.pkgsStatic.pkg-config ];
|
nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [ pkgs.pkgsStatic.pkg-config ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = prevAttrs.buildInputs ++ [
|
||||||
pkgsStatic.openssl
|
(pkgsStatic.libkrb5.overrideAttrs (finalAttrs: prevAttrs: {
|
||||||
|
# disable keyutils dependency, to avoid linking errors
|
||||||
|
configureFlags = prevAttrs.configureFlags ++ [ "--without-keyutils" ];
|
||||||
|
}))
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user