b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gawk: unconditionally apply the patch to fix PIE linkage on musl

Browse source 
Related: https://github.com/NixOS/nixpkgs/pull/210124
This commit is contained in:
Sergei Trofimovich 2023-01-11 21:18:30 +00:00
parent b3d2428df4
commit a0bb02d340
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/tools/text/gawk/default.nix
View file

@ -16,7 +16,7 @@
assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
pname = "gawk" + lib.optionalString interactive "-interactive";
version = "5.2.1";
@ -31,13 +31,19 @@ stdenv.mkDerivation (rec {
./darwin-no-pma.patch
];
# PIE is incompatible with the "persistent malloc" ("pma") feature.
# While build system attempts to pass -no-pie to gcc. nixpkgs' `ld`
# wrapped still passes `-pie` flag to linker and breaks linkage.
# Let's disable "pie" until `ld` is fixed to do the right thing.
hardeningDisable = [ "pie" ];
# When we do build separate interactive version, it makes sense to always include man.
outputs = [ "out" "info" ]
++ lib.optional (!interactive) "man";
nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales
# no-pma fix
++ [ autoreconfHook ];
# no-pma fix
nativeBuildInputs = [ autoreconfHook ]
++ lib.optional (doCheck && stdenv.isLinux) glibcLocales;
buildInputs = lib.optional withSigsegv libsigsegv
++ lib.optional interactive readline
@ -83,8 +89,4 @@ stdenv.mkDerivation (rec {
platforms = platforms.unix ++ platforms.windows;
maintainers = [ ];
};
} // lib.optionalAttrs stdenv.hostPlatform.isMusl {
# PIE is incompatible with the "persistent malloc" ("pma") feature.
# FIXME: make unconditional in staging (added to avoid rebuilds in staging-next)
hardeningDisable = [ "pie" ];
})
}