pyrox.dev
Merge pull request #210258 from trofi/gawk-no-pie-on-musl
+11
-9
pkgs/tools/text/gawk/default.nix
+11
-9
pkgs/tools/text/gawk/default.nix
···
16
16
17
17
assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
18
18
19
-
stdenv.mkDerivation (rec {
19
+
stdenv.mkDerivation rec {
20
20
pname = "gawk" + lib.optionalString interactive "-interactive";
21
21
version = "5.2.1";
22
22
···
31
31
./darwin-no-pma.patch
32
32
];
33
33
34
+
# PIE is incompatible with the "persistent malloc" ("pma") feature.
35
+
# While build system attempts to pass -no-pie to gcc. nixpkgs' `ld`
36
+
# wrapped still passes `-pie` flag to linker and breaks linkage.
37
+
# Let's disable "pie" until `ld` is fixed to do the right thing.
38
+
hardeningDisable = [ "pie" ];
39
+
34
40
# When we do build separate interactive version, it makes sense to always include man.
35
41
outputs = [ "out" "info" ]
36
42
++ lib.optional (!interactive) "man";
37
43
38
-
nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales
39
-
# no-pma fix
40
-
++ [ autoreconfHook ];
44
+
# no-pma fix
45
+
nativeBuildInputs = [ autoreconfHook ]
46
+
++ lib.optional (doCheck && stdenv.isLinux) glibcLocales;
41
47
42
48
buildInputs = lib.optional withSigsegv libsigsegv
43
49
++ lib.optional interactive readline
···
83
89
platforms = platforms.unix ++ platforms.windows;
84
90
maintainers = [ ];
85
91
};
86
-
} // lib.optionalAttrs stdenv.hostPlatform.isMusl {
87
-
# PIE is incompatible with the "persistent malloc" ("pma") feature.
88
-
# FIXME: make unconditional in staging (added to avoid rebuilds in staging-next)
89
-
hardeningDisable = [ "pie" ];
90
-
})
92
+
}