From 8c73600d0cef45a31271338a1fc37b63078fb448 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 16 Nov 2024 00:34:51 +0000 Subject: [PATCH] libiconv: cleanup derivation --- pkgs/development/libraries/libiconv/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 036f822f7843..3ece3c925f76 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -7,7 +7,7 @@ # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "libiconv"; version = "1.17"; @@ -22,6 +22,9 @@ stdenv.mkDerivation (rec { # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0 nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593 + hardeningDisable = lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify"; + setupHooks = [ ../../../build-support/setup-hooks/role.bash ./setup-hook.sh @@ -92,7 +95,4 @@ stdenv.mkDerivation (rec { # This library is not needed on GNU platforms. hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd; }; -} // lib.optionalAttrs (stdenv.hostPlatform.libc == "bionic") { - # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593 - hardeningDisable = [ "fortify" ]; -}) +}