Merge pull request #322831 from jtojnar/android-studio-gnome2-drop

android-studio: remove gnome_vfs & GConf
This commit is contained in:
Masum Reza 2024-06-28 09:02:44 +05:30 committed by GitHub
commit 3f8b731091
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions

View File

@ -17,7 +17,7 @@
, gnugrep
, gnused
, gnutar
, gtk2, gnome_vfs, glib, GConf
, gtk2, glib
, gzip
, fontconfig
, freetype
@ -175,9 +175,7 @@ let
# For GTKLookAndFeel
gtk2
gnome_vfs
glib
GConf
]}"
# AS launches LLDBFrontend with a custom LD_LIBRARY_PATH

View File

@ -1,11 +1,10 @@
{ callPackage, makeFontsConf, gnome2, buildFHSEnv, tiling_wm ? false }:
{ callPackage, makeFontsConf, buildFHSEnv, tiling_wm ? false }:
let
mkStudio = opts: callPackage (import ./common.nix opts) {
fontsConf = makeFontsConf {
fontDirectories = [];
};
inherit (gnome2) GConf gnome_vfs;
inherit buildFHSEnv;
inherit tiling_wm;
};