diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-18 13:35:59 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-18 13:35:59 +0100 |
| commit | 0136206b12cdcee87d34ccdfd1864c0bb6541aec (patch) | |
| tree | eb6597b5dc6da16585f5e9a8d1649f44ea3f51b3 /pkgs/development/mobile | |
| parent | c31077a6020c4d365496a618ba07121b9331bc52 (diff) | |
| parent | de4012ac80df34f1b77f07c70e935e4908729e71 (diff) | |
| download | nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.gz nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.bz2 nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.lz nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.xz nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.zst nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/emulator.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/mobile/androidenv/tools/26.nix | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index e08078ea672..c8fce166aa7 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -5,16 +5,16 @@ deployAndroidPackage { buildInputs = [ autoPatchelfHook makeWrapper ] ++ lib.optional (os == "linux") [ pkgs.glibc - pkgs.xlibs.libX11 - pkgs.xlibs.libXext - pkgs.xlibs.libXdamage - pkgs.xlibs.libXfixes - pkgs.xlibs.libxcb - pkgs.xlibs.libXcomposite - pkgs.xlibs.libXcursor - pkgs.xlibs.libXi - pkgs.xlibs.libXrender - pkgs.xlibs.libXtst + pkgs.xorg.libX11 + pkgs.xorg.libXext + pkgs.xorg.libXdamage + pkgs.xorg.libXfixes + pkgs.xorg.libxcb + pkgs.xorg.libXcomposite + pkgs.xorg.libXcursor + pkgs.xorg.libXi + pkgs.xorg.libXrender + pkgs.xorg.libXtst pkgs.libcxx pkgs.libGL pkgs.libpulseaudio diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix index 0234c9f3d04..a768a120547 100644 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -4,7 +4,7 @@ deployAndroidPackage { name = "androidsdk"; inherit os package; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; + ++ 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 ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' @@ -27,7 +27,7 @@ deployAndroidPackage { # Wrap monitor script wrapProgram $PWD/monitor \ --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} # Patch all script shebangs patchShebangs . |