Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

postgresql: drop build-time dependency on GHC #354538

Merged
merged 1 commit into from
Nov 9, 2024
Merged

postgresql: drop build-time dependency on GHC #354538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions pkgs/servers/sql/postgresql/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let
, pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin
, linux-pam, bison, flex, perl, docbook_xml_dtd_45, docbook-xsl-nons, libxslt

, removeReferencesTo, writeShellApplication
, removeReferencesTo, writeShellScriptBin

, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs
, gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
Expand Down Expand Up @@ -53,10 +53,7 @@ let
else
stdenv;

pg_config = writeShellApplication {
name = "pg_config";
text = builtins.readFile ./pg_config.sh;
};
pg_config = writeShellScriptBin "pg_config" (builtins.readFile ./pg_config.sh);
in stdenv'.mkDerivation (finalAttrs: {
inherit version;
pname = pname + lib.optionalString jitSupport "-jit";
Expand Down
2 changes: 2 additions & 0 deletions pkgs/servers/sql/postgresql/pg_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
set -euo pipefail

# The real pg_config needs to be in the same path as the "postgres" binary
# to return proper paths. However, we want it in the -dev output to prevent
# cyclic references and to prevent blowing up the runtime closure. Thus, we
Expand Down