From 0893083870d9c66decbb7f10fad4d2d45ca60757 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Jun 2024 09:38:11 +0200 Subject: android-studio: remove gnome_vfs & GConf Those libraries have been deprecated for 10+ years and require daemons that no-one has running these days. --- pkgs/applications/editors/android-studio/common.nix | 4 +--- 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; }; -- cgit 1.4.1