b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

androidenv: fix libgcc_s.so.1 -> not found

Browse source
This commit is contained in:
Hadi 2023-04-16 10:19:44 -04:00 committed by Artturin
parent 0135b7a556
commit 81f75f9569
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/mobile/androidenv/tools.nix
View file

@ -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 ])
);