cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

android-studio: use buildFHSUserEnvBubblewrap

Browse source
This commit is contained in:
Atemu 2020-07-31 15:28:57 +02:00
parent 46d8f1a8a2
commit 3f5157f122
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/editors/android-studio/default.nix
View file

@ -1,4 +1,4 @@
{ callPackage, makeFontsConf, gnome2 }: { callPackage, makeFontsConf, gnome2, buildFHSUserEnv }:
let let
mkStudio = opts: callPackage (import ./common.nix opts) { mkStudio = opts: callPackage (import ./common.nix opts) {
@ -6,6 +6,7 @@ let
fontDirectories = []; fontDirectories = [];
}; };
inherit (gnome2) GConf gnome_vfs; inherit (gnome2) GConf gnome_vfs;
inherit buildFHSUserEnv;
}; };
stableVersion = { stableVersion = {
version = "4.0.1.0"; # "Android Studio 4.0.1" version = "4.0.1.0"; # "Android Studio 4.0.1"

4
pkgs/top-level/all-packages.nix
View file

@ -19086,7 +19086,9 @@ in
amsn = callPackage ../applications/networking/instant-messengers/amsn { }; amsn = callPackage ../applications/networking/instant-messengers/amsn { };
androidStudioPackages = recurseIntoAttrs androidStudioPackages = recurseIntoAttrs
(callPackage ../applications/editors/android-studio { }); (callPackage ../applications/editors/android-studio {
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
});
android-studio = androidStudioPackages.stable; android-studio = androidStudioPackages.stable;
animbar = callPackage ../applications/graphics/animbar { }; animbar = callPackage ../applications/graphics/animbar { };