diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index ea28d651eba9..1300f7a75035 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,4 +1,6 @@ { fetchurl +, fetchFromGitLab +, fetchpatch , stdenv , substituteAll , accountsservice @@ -68,12 +70,16 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.36.4"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m7pxjgymc7aqqz0vcmlq91nxnwzd1v7v1gdhrfam49krxmk80mc"; + sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d"; }; + # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html + prePatch = (import ../gvc-with-ucm-prePatch.nix { + inherit fetchFromGitLab; + }); nativeBuildInputs = [ docbook_xsl @@ -143,6 +149,17 @@ stdenv.mkDerivation rec { inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) + + # Fix double free when leaving user accounts panel. + # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/853 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/e80b4b5f58f448c5a3d38721f7bba32c413d46e7.patch"; + sha256 = "GffsSU/uNS0Fg2lXbOuD/BrWBT4D2VKgWNGifG0FBUw="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch"; + sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU="; + }) ]; postPatch = '' @@ -150,10 +167,6 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/meson_post_install.py ''; - mesonFlags = [ - "-Dgnome_session_libexecdir=${gnome-session}/libexec" - ]; - preFixup = '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" |