From 81f75f95692ef62c4c9ee32ab84f4d166f165c8a Mon Sep 17 00:00:00 2001 From: Hadi Date: Sun, 16 Apr 2023 10:19:44 -0400 Subject: [PATCH] androidenv: fix libgcc_s.so.1 -> not found --- pkgs/development/mobile/androidenv/tools.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index 091b94489479..0177d8e6f7b7 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -6,7 +6,9 @@ deployAndroidPackage { nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; buildInputs = lib.optional (os == "linux") ( - (with pkgs; [ glibc freetype fontconfig fontconfig.lib]) + (with pkgs; [ glibc freetype fontconfig fontconfig.lib + stdenv.cc.cc.libgcc or null # fix for https://github.com/NixOS/nixpkgs/issues/226357 + ]) ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) ++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) );