gnome3.gnome-shell: 3.38.3 → 40.0

+21 -10
+20 -9
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
··· 22 22 , librsvg 23 23 , geoclue2 24 24 , perl 25 - , docbook_xml_dtd_42 26 - , docbook_xml_dtd_43 25 + , docbook_xml_dtd_45 27 26 , desktop-file-utils 28 27 , libpulseaudio 29 28 , libical ··· 46 45 , mutter 47 46 , evolution-data-server 48 47 , gtk3 48 + , gtk4 49 49 , sassc 50 50 , systemd 51 51 , pipewire ··· 66 66 in 67 67 stdenv.mkDerivation rec { 68 68 pname = "gnome-shell"; 69 - version = "3.38.3"; 69 + version = "40.0"; 70 70 71 71 outputs = [ "out" "devdoc" ]; 72 72 73 73 src = fetchurl { 74 - url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 75 - sha256 = "sha256-U0W0GMsSqXKVXOXM6u1mYkgAJzNrXFHa6lcwV1tiHO0="; 74 + url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; 75 + sha256 = "sha256-vOcfQC36qcXiab9lv0iiI0PYlubPmiw0ZpOS1/v2hHg="; 76 76 }; 77 77 78 78 patches = [ ··· 97 97 revert = true; 98 98 sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl"; 99 99 }) 100 + 101 + # Fix copying technical details when extension crashes. 102 + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1795 103 + (fetchpatch { 104 + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/1b5d71130e3a48d8f636542f979346add7829544.patch"; 105 + sha256 = "WXRG/+u/N7KTTG1HutcMvw5HU2XWUmqFExmOXrOkeeA="; 106 + }) 107 + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1796 108 + (fetchpatch { 109 + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/53dd291aba24e9eab3994b0ffeadec05e0150470.patch"; 110 + sha256 = "xD0iIjlUGDLM5tTNDNtx6ZgxL25EKYgaBEH4JOZh8AM="; 111 + }) 100 112 ]; 101 113 102 114 nativeBuildInputs = [ ··· 105 117 pkg-config 106 118 gettext 107 119 docbook-xsl-nons 108 - # Switch to 4.5 in the 40. 109 - docbook_xml_dtd_42 110 - docbook_xml_dtd_43 120 + docbook_xml_dtd_45 111 121 gtk-doc 112 122 perl 113 123 wrapGAppsHook ··· 137 147 evolution-data-server 138 148 libical 139 149 gtk3 150 + gtk4 140 151 gdm 141 152 geoclue2 142 153 adwaita-icon-theme ··· 189 200 190 201 postFixup = '' 191 202 # The services need typelibs. 192 - for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do 203 + for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do 193 204 wrapGApp $out/share/gnome-shell/$svc 194 205 done 195 206 '';
+1 -1
pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch
··· 3 3 @@ -13,7 +13,7 @@ shew_sources = [ 4 4 libshew = library(full_name, 5 5 sources: shew_sources, 6 - dependencies: [gtk_dep], 6 + dependencies: [gtk_dep, x11_dep], 7 7 - install_dir: pkglibdir, 8 8 + install_dir: get_option('prefix') / pkglibdir, 9 9 install: true,