diff options
| author | Masum Reza <50095635+JohnRTitor@users.noreply.github.com> | 2024-06-28 09:02:44 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-28 09:02:44 +0530 |
| commit | 3f8b7310913d9e4805b7e20b2beabb27e333b31f (patch) | |
| tree | 9f48b1ca472a701b355d852f5c5bb5e2c843cff8 | |
| parent | 33be72b31b7cc5a0b43cc3b6c005cf4e4d47d899 (diff) | |
| parent | 0893083870d9c66decbb7f10fad4d2d45ca60757 (diff) | |
Merge pull request #322831 from jtojnar/android-studio-gnome2-drop
android-studio: remove gnome_vfs & GConf
| -rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/android-studio/default.nix | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 74f7d3c8f7a47..09bc0d43212cf 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -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 diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c2bc17f8692b5..163948c90dbe4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -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; }; |