public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gnome-desktop: honor $XKB_CONFIG_ROOT

This commit is contained in:
Louis Bettens 2019-12-22 16:58:32 +01:00
parent 636dabcf80
commit 729bd0ba58
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@ -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 , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland
, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
@ -30,6 +30,14 @@ stdenv.mkDerivation rec {
bubblewrap_bin = "${bubblewrap}/bin/bwrap"; bubblewrap_bin = "${bubblewrap}/bin/bwrap";
inherit (builtins) storeDir; 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 = [ mesonFlags = [