diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-28 20:34:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-28 20:34:56 +0100 |
| commit | 332cfab4cee02852378d3a61f9f5035099488717 (patch) | |
| tree | f0bd8426d788ac407f4b5d76a12ce5416e27a752 /pkgs/desktops/gnome-3 | |
| parent | 5f6635144a27a4383cf97589a623cf9a671d7004 (diff) | |
| parent | 0cebd5a0b7b82987a5ad06026443a4cb3c2b8bd3 (diff) | |
| download | nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.gz nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.bz2 nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.lz nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.xz nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.zst nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.zip | |
Merge pull request #76591 from lourkeur/set_XKB_CONFIG_ROOT
Fix services.xserver.extraLayouts under GNOME 3
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index f7f83b56932..6e777636747 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib +{ stdenv, fetchurl, fetchpatch, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: @@ -30,6 +30,14 @@ stdenv.mkDerivation rec { bubblewrap_bin = "${bubblewrap}/bin/bwrap"; inherit (builtins) storeDir; }) + + # honor $XKB_CONFIG_ROOT + # addresses #76590: services.xserver.extraLayouts aren't honored by GNOME3 + # NOTE: should be merged upstream in 3.36. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-desktop/commit/450446b5353e8231edded4d5b5db90a67a9fa9b7.diff"; + sha256 = "07y989x7mbgn3rsm2qfdi8qkkc8i60k28hw87l744nlkydn78kq5"; + }) ]; mesonFlags = [ |