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

gnome3.gnome-desktop: 3.34.4 -> 3.36.0

Browse Source
This commit is contained in:
Tor Hedin Brønner 2020-02-09 01:25:43 +01:00 committed by Jan Tojnar
parent 8f65ef2d8a
commit e979d5f7b9
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,16 @@
{ stdenv, fetchurl, fetchpatch, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib { stdenv, fetchurl, 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 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-desktop"; pname = "gnome-desktop";
version = "3.34.4"; version = "3.36.0";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1g0cvsx0gk65kfa91knkqg7l2isrnlpvqwjbzpr3a5f2girp4gn5"; sha256 = "05awmswzd4qa0vg23np0s7z6qks73j3sfj71y8azpvyxricw612b";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -30,14 +30,6 @@ 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 = [