diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 42079c22f30..c28695ed8e2 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -38,7 +38,7 @@ let gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-log gnome-system-monitor simple-scan gnome-terminal gnome-user-docs evolution file-roller gedit - gnome-clocks gnome-music gnome-tweak-tool gnome-photos + gnome-clocks gnome-music gnome-tweaks gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-getting-started-docs gnome-packagekit gnome-software @@ -394,7 +394,7 @@ let gexiv2 = callPackage ./misc/gexiv2 { }; - gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; + gnome-tweaks = callPackage ./misc/gnome-tweaks { }; gpaste = callPackage ./misc/gpaste { }; @@ -426,6 +426,7 @@ let gnome_terminal = gnome-terminal; # added 2018-02-25 gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnome-tweak-tool = gnome-tweaks; # added 2018-03-21 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 libgames-support = libgnome-games-support; # added 2018-03-14 diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix similarity index 63% rename from pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix rename to pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index 92220e23145..75b5060d7b3 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -4,14 +4,14 @@ , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: let - pname = "gnome-tweak-tool"; - version = "3.27.3"; + pname = "gnome-tweaks"; + version = "3.28.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1z8l1ym6qmhqirsny4hcqv989ilv5mm764y8q7920zprdcjprds3"; + sha256 = "0d8zxfa8r4n4l6jzyzy6q58padxjlrad3c71mwqidm2ww8nm6i19"; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ in stdenv.mkDerivation rec { libnotify gnome3.gnome-shell python3Packages.pygobject3 libsoup gnome3.gnome-settings-daemon gnome3.nautilus gnome3.mutter gnome3.gnome-desktop gobjectIntrospection + gnome3.nautilus ]; postPatch = '' @@ -34,24 +35,6 @@ in stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH") ''; - patches = [ - (fetchurl { - name = "find_gsettings.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=365642; - sha256 = "14ik1kad0w99xa2wn3d4ynrkhnwchjlqfbaij7p11y5zpiwhaha4"; - }) - (fetchurl { - name = "0001-Search-for-themes-and-icons-in-system-data-dirs.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=365643; - sha256 = "1phq3c7hc9lryih6rp3m5wmp88rfbl6iv42ng4g6bzm1jphgl89f"; - }) - (fetchurl { - name = "0001-appearance-Don-t-duplicate-the-cursor-theme-name.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=365648; - sha256 = "1n9vwsfz4sx72qsi1gd1y7460zmagwirvmi9qrfhc3ahanpyn4fr"; - }) - ]; - passthru = { updateScript = gnome3.updateScript { packageName = pname;