Skip to content

Commit c059f2b

Browse files
yvan-srakasamrose
authored andcommitted
fix(postgresql): remove redundant patch substitutions
Removed duplicate substituteInPlace calls that were redundantly applied during previous merge operations. Cleaned up the patch application to avoid duplicate substitutions.
1 parent 5590a70 commit c059f2b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

nix/postgresql/generic.nix

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ let
100100
inherit hash;
101101
};
102102

103-
hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ];
103+
# The 'pie' hardening flag has been removed in favor of enabling PIE by default in compilers and should no longer be used.
104+
# hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ];
104105

105106
outputs = [
106107
"out"
@@ -204,9 +205,6 @@ let
204205
postPatch = ''
205206
# Hardcode the path to pgxs so pg_config returns the path in $out
206207
substituteInPlace "src/common/config_info.c" --subst-var out
207-
substituteInPlace "src/backend/commands/collationcmds.c" --replace-fail '@locale@' '${
208-
if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc
209-
}/bin/locale'
210208
''
211209
+ lib.optionalString jitSupport ''
212210
# Force lookup of jit stuff in $out instead of $lib

0 commit comments

Comments
 (0)