mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-02 10:14:09 +00:00
libiconv: fix android cross-compile (#354895)
This commit is contained in:
commit
99e2d8992d
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
# assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross
|
# assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (rec {
|
||||||
pname = "libiconv";
|
pname = "libiconv";
|
||||||
version = "1.17";
|
version = "1.17";
|
||||||
|
|
||||||
@ -87,4 +87,7 @@ stdenv.mkDerivation rec {
|
|||||||
# This library is not needed on GNU platforms.
|
# This library is not needed on GNU platforms.
|
||||||
hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd;
|
hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd;
|
||||||
};
|
};
|
||||||
}
|
} // lib.optionalAttrs (stdenv.hostPlatform.libc == "bionic") {
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
|
||||||
|
hardeningDisable = [ "fortify" ];
|
||||||
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user