Unverified Commit 99e2d899 authored by Rick van Schijndel's avatar Rick van Schijndel Committed by GitHub
Browse files

libiconv: fix android cross-compile (#354895)

parents 25dfc053 d547fa17

pkgs/development/libraries/libiconv/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -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" ];

})