diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-02 22:14:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-02 22:14:30 -0400 |
| commit | 0c52651bb73c3c8b7446803dcc4229f9c3bfbc22 (patch) | |
| tree | 573805eab05fecaf00c83c2fe31aa92882b86862 /pkgs/desktops | |
| parent | c3c020c1688140e2c41c1854543d8daaabd5e092 (diff) | |
| parent | fa03881954a0957522785dc5c52f45d07cdae87d (diff) | |
| download | nixlib-0c52651bb73c3c8b7446803dcc4229f9c3bfbc22.tar nixlib-0c52651bb73c3c8b7446803dcc4229f9c3bfbc22.tar.gz nixlib-0c52651bb73c3c8b7446803dcc4229f9c3bfbc22.tar.bz2 nixlib-0c52651bb73c3c8b7446803dcc4229f9c3bfbc22.tar.lz nixlib-0c52651bb73c3c8b7446803dcc4229f9c3bfbc22.tar.xz nixlib-0c52651bb73c3c8b7446803dcc4229f9c3bfbc22.tar.zst nixlib-0c52651bb73c3c8b7446803dcc4229f9c3bfbc22.zip | |
Merge pull request #67935 from jtojnar/gnome-fixes
gnome3.gvfs: fix eval with allowAliases = false
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 16828f08bc27..6cc6848b316f 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -57,8 +57,6 @@ lib.makeScope pkgs.newScope (self: with self; { #### DESKTOP - gvfs = pkgs.gvfs.override { gnome = self; }; - # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; @@ -78,7 +76,10 @@ lib.makeScope pkgs.newScope (self: with self; { glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 # Included for backwards compatibility - libsoup libwnck gtk-doc gnome-doc-utils rarian; + libsoup libwnck gtk-doc gnome-doc-utils rarian + + gvfs # added 2019-09-03 + ; gtk = pkgs.gtk2; gtkmm = pkgs.gtkmm2; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 1f16ff9d0b52..21ecc7e64ee4 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -53,10 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; { gjs = callPackage ./core/gjs { }; - glib-networking = pkgs.glib-networking.override { - inherit (pkgs) gsettings-desktop-schemas; - }; - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; @@ -111,7 +107,7 @@ lib.makeScope pkgs.newScope (self: with self; { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; + gvfs = pkgs.gvfs.override { gnomeSupport = true; }; eog = callPackage ./core/eog { }; @@ -348,6 +344,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 inherit (pkgs) gnome-video-effects; # added 2019-08-19 inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 + inherit (pkgs) glib-networking; # added 2019-09-02 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; |