From b4d235f72aff101b0e334db44f04d48e6fda8295 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 5 Jun 2024 19:53:29 +0200 Subject: [PATCH] nix: refactor to remove TODO We have meanwhile received the commit in question. --- nix/static.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nix/static.nix b/nix/static.nix index 627ff7436..ef6559dd2 100644 --- a/nix/static.nix +++ b/nix/static.nix @@ -25,14 +25,9 @@ let overrides = pkgs.lib.composeExtensions old.overrides (_: prev: { postgresql-libpq = (lib.overrideCabal prev.postgresql-libpq { - # TODO: This section can be simplified when this PR has made it's way to us: - # https://github.com/NixOS/nixpkgs/pull/286370 - # Using use-pkg-config flag, because pg_config won't work when cross-compiling - configureFlags = [ "-fuse-pkg-config" ]; # postgresql doesn't build in the fully static overlay - but the default # derivation is built with static libraries anyway. libraryPkgconfigDepends = [ pkgsCross.libpq ]; - librarySystemDepends = [ ]; }).overrideAttrs (_: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ (pkgsStatic.libkrb5.overrideAttrs (_: prevAttrs: {