pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #173376 from status-im/androidenv-fix-darwin

androidenv: include autoPatchelfHook only on Linux

authored by Anderson Torres and committed by GitHub 28fa3ec5 1b364424

+42 -35
unified split
+2 -2
pkgs/development/mobile/androidenv/cmake.nix
··· 1 - {deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: 1 + {deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}: 2 2 3 3 deployAndroidPackage { 4 4 inherit package os; 5 - nativeBuildInputs = [ autoPatchelfHook ]; 5 + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; 6 6 buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ]; 7 7 patchInstructions = lib.optionalString (os == "linux") '' 8 8 autoPatchelf $packageBaseDir/bin
+2 -2
pkgs/development/mobile/androidenv/compose-android-packages.nix
··· 171 171 172 172 cmake = map (version: 173 173 import ./cmake.nix { 174 - inherit deployAndroidPackage os autoPatchelfHook pkgs lib; 174 + inherit deployAndroidPackage os autoPatchelfHook pkgs lib stdenv; 175 175 package = packages.cmake.${version}; 176 176 } 177 177 ) cmakeVersions; ··· 179 179 # Creates a NDK bundle. 180 180 makeNdkBundle = ndkVersion: 181 181 import ./ndk-bundle { 182 - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools; 182 + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools stdenv; 183 183 package = packages.ndk-bundle.${ndkVersion}; 184 184 }; 185 185
+29 -27
pkgs/development/mobile/androidenv/emulator.nix
··· 2 2 3 3 deployAndroidPackage { 4 4 inherit package os; 5 - buildInputs = [ autoPatchelfHook makeWrapper ] 6 - ++ lib.optionals (os == "linux") [ 7 - pkgs.glibc 8 - pkgs.xorg.libX11 9 - pkgs.xorg.libXext 10 - pkgs.xorg.libXdamage 11 - pkgs.xorg.libXfixes 12 - pkgs.xorg.libxcb 13 - pkgs.xorg.libXcomposite 14 - pkgs.xorg.libXcursor 15 - pkgs.xorg.libXi 16 - pkgs.xorg.libXrender 17 - pkgs.xorg.libXtst 18 - pkgs.libcxx 19 - pkgs.libGL 20 - pkgs.libpulseaudio 21 - pkgs.libuuid 22 - pkgs.zlib 23 - pkgs.ncurses5 24 - pkgs.stdenv.cc.cc 25 - pkgs_i686.glibc 26 - pkgs.expat 27 - pkgs.freetype 28 - pkgs.nss 29 - pkgs.nspr 30 - pkgs.alsa-lib 31 - ]; 5 + buildInputs = [ makeWrapper ] 6 + ++ lib.optionals (os == "linux") (with pkgs; [ 7 + autoPatchelfHook 8 + glibc 9 + libcxx 10 + libGL 11 + libpulseaudio 12 + libuuid 13 + zlib 14 + ncurses5 15 + stdenv.cc.cc 16 + i686.glibc 17 + expat 18 + freetype 19 + nss 20 + nspr 21 + alsa-lib 22 + ]) ++ (with pkgs.xorg; [ 23 + libX11 24 + libXext 25 + libXdamage 26 + libXfixes 27 + libxcb 28 + libXcomposite 29 + libXcursor 30 + libXi 31 + libXrender 32 + libXtst 33 + ]); 32 34 patchInstructions = lib.optionalString (os == "linux") '' 33 35 addAutoPatchelfSearchPath $packageBaseDir/lib 34 36 addAutoPatchelfSearchPath $packageBaseDir/lib64
+3 -2
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
··· 1 - { lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook 1 + { stdenv, lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook 2 2 , deployAndroidPackage, package, os, platform-tools 3 3 }: 4 4 ··· 9 9 in 10 10 deployAndroidPackage { 11 11 inherit package os; 12 - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; 12 + nativeBuildInputs = [ makeWrapper ] 13 + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; 13 14 autoPatchelfIgnoreMissingDeps = true; 14 15 buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.python2 pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out pkgs.libxml2 ]; 15 16 patchInstructions = lib.optionalString (os == "linux") (''
+6 -2
pkgs/development/mobile/androidenv/tools/26.nix
··· 3 3 deployAndroidPackage { 4 4 name = "androidsdk"; 5 5 inherit os package; 6 - buildInputs = [ autoPatchelfHook makeWrapper ] 7 - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; 6 + buildInputs = [ makeWrapper ] 7 + ++ lib.optional (os == "linux") ( 8 + (with pkgs; [ autoPatchelfHook glibc freetype fontconfig fontconfig.lib]) 9 + ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) 10 + ++ (with pkgs_i686; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) 11 + ); 8 12 9 13 patchInstructions = '' 10 14 ${lib.optionalString (os == "linux") ''