From d547fa17c5435e96c083b127a436b62ac46ccb3f Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sun, 10 Nov 2024 02:26:09 +0000 Subject: [PATCH] libiconv: fix android cross-compile --- pkgs/development/libraries/libiconv/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 9bb60501a065..3cf0e799cb7e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -6,7 +6,7 @@ # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "libiconv"; version = "1.17"; @@ -87,4 +87,7 @@ 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" ]; +})