pyrox.dev
libiconv: cleanup derivation (#356317)
+5
-5
pkgs/development/libraries/libiconv/default.nix
+5
-5
pkgs/development/libraries/libiconv/default.nix
···
7
7
8
8
# assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross
9
9
10
-
stdenv.mkDerivation (rec {
10
+
stdenv.mkDerivation rec {
11
11
pname = "libiconv";
12
12
version = "1.17";
13
13
···
21
21
# necessary to build on FreeBSD native pending inclusion of
22
22
# https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
23
23
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
24
+
25
+
# https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
26
+
hardeningDisable = lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify";
24
27
25
28
setupHooks = [
26
29
../../../build-support/setup-hooks/role.bash
···
92
95
# This library is not needed on GNU platforms.
93
96
hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd;
94
97
};
95
-
} // lib.optionalAttrs (stdenv.hostPlatform.libc == "bionic") {
96
-
# https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
97
-
hardeningDisable = [ "fortify" ];
98
-
})
98
+
}