Merge pull request #226489 from hadilq/androidenv-fix-libgcc_s-not-found

2023-04-18 21:32:58 +03:00
parent ca07838f2e 81f75f9569
commit 24757871eb
1 changed files with 3 additions and 1 deletions
@@ -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 ])
    );