summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-10-13 22:43:45 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-10-24 01:18:43 +0200
commit948edf8f2662d7f1b5445aaf6d291edc029bb27b (patch)
tree1e7dbe1116126dab5c5ea95f31dba4fde4f4e308
parent94ed06e3fadcc6a9c7fdaea123b09877a40c503f (diff)
downloadnixpkgs-948edf8f2662d7f1b5445aaf6d291edc029bb27b.tar
nixpkgs-948edf8f2662d7f1b5445aaf6d291edc029bb27b.tar.gz
nixpkgs-948edf8f2662d7f1b5445aaf6d291edc029bb27b.tar.bz2
nixpkgs-948edf8f2662d7f1b5445aaf6d291edc029bb27b.tar.lz
nixpkgs-948edf8f2662d7f1b5445aaf6d291edc029bb27b.tar.xz
nixpkgs-948edf8f2662d7f1b5445aaf6d291edc029bb27b.tar.zst
nixpkgs-948edf8f2662d7f1b5445aaf6d291edc029bb27b.zip
gnome3.gnome-control-center: Fix crash after leaving user-accounts
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-control-center/default.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 047133dd154..1300f7a7503 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,5 +1,6 @@
 { fetchurl
 , fetchFromGitLab
+, fetchpatch
 , stdenv
 , substituteAll
 , accountsservice
@@ -148,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 = ''