gnome3.gnome-shell: 3.32.2 -> 3.34.0

This commit is contained in:
Tor Hedin Brønner 2019-09-09 21:46:15 +02:00
parent 4845bd046b
commit ca97caee7e
2 changed files with 6 additions and 5 deletions

View File

@ -14,11 +14,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gnome-shell"; pname = "gnome-shell";
version = "3.32.2"; version = "3.34.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5"; sha256 = "0vdx4mfj46cpvzn6mhxc1ivg138437f5m4n3k4vb54pk45w4s00x";
}; };
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";
@ -49,6 +49,8 @@ in stdenv.mkDerivation rec {
caribou caribou
]; ];
mesonFlags = [ "-Dextensions_tool=false" ];
patches = [ patches = [
(fetchpatch { (fetchpatch {
name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; name = "0001-build-Add-missing-dependency-to-run-js-test.patch";

View File

@ -11,10 +11,9 @@
null); null);
--- a/js/ui/status/keyboard.js --- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js
@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button { @@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button {
let description = xkbLayout;
if (xkbVariant.length > 0) if (xkbVariant.length > 0)
description = description + '\t' + xkbVariant; description = `${description}\t${xkbVariant}`;
- Util.spawn(['gkbd-keyboard-display', '-l', description]); - Util.spawn(['gkbd-keyboard-display', '-l', description]);
+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); + Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);