jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix: Clarify pkg-config usage in static.nix a bit

Browse Source 
This will make it easier to make the switch from pkgsCross.libpq to pkgsStatic.libpq,
once that is possible to build upstream - if ever.
This commit is contained in:
Wolfgang Walther
2024-02-24 12:08:40 +01:00
parent 22e8906c40
commit caf0a70171
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/static.nix
+6 -5
View File
@@ -30,11 +30,12 @@ let
postgresql = pkgsCross.libpq; postgresql = pkgsCross.libpq;
}).overrideAttrs (finalAttrs: prevAttrs: { }).overrideAttrs (finalAttrs: prevAttrs: {
# Using use-pkg-config flag, because pg_config won't work when cross-compiling # Using use-pkg-config flag, because pg_config won't work when cross-compiling
configureFlags = prevAttrs.configureFlags ++ [ "-fuse-pkg-config" ]; configureFlags = prevAttrs.configureFlags ++ [
# Using pkg-config without pkgsCross, because "pkg-config" is hardcoded in "-fuse-pkg-config"
# postgresql-libpq's Setup.hs. Using pkgsStatic to make pkg-config return the "--with-pkg-config=${pkgsStatic.pkgsBuildHost.pkg-config}/bin/${pkgsStatic.targetPlatform.config}-pkg-config"
# static libs for libpq. ];
nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [ pkgs.pkgsStatic.pkg-config ]; # This needs to match where libpq is coming from above.
nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [ pkgsCross.pkgsBuildHost.pkg-config ];
buildInputs = prevAttrs.buildInputs ++ [ buildInputs = prevAttrs.buildInputs ++ [
(pkgsStatic.libkrb5.overrideAttrs (finalAttrs: prevAttrs: { (pkgsStatic.libkrb5.overrideAttrs (finalAttrs: prevAttrs: {