Unverified Commit 3f8b7310 authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

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

android-studio: remove gnome_vfs & GConf
parents 33be72b3 08930838
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -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
+1 −2
Original line number Diff line number Diff line
{ 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;
  };