From 255185cc655c9279aab6d1bfce22781346efa829 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 21 Feb 2019 20:03:16 -0500
Subject: [PATCH] gnome3.gnome-desktop: 3.30.2 -> 3.30.2.1
https://gitlab.gnome.org/GNOME/gnome-desktop/blob/2da71b79c8e2574ec5ba3075ad9c1a8d5fd1b7ec/NEWS
---
.../core/gnome-desktop/bubblewrap-paths.patch | 21 ++++++++-----------
.../gnome-3/core/gnome-desktop/default.nix | 4 ++--
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
index 59191bddd9af..175118ac5ffd 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
@@ -1,19 +1,16 @@
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -504,14 +504,10 @@
+@@ -536,10 +536,9 @@ add_bwrap (GPtrArray *array,
g_return_val_if_fail (script->s_infile != NULL, FALSE);
add_args (array,
- "bwrap",
- "--ro-bind", "/usr", "/usr",
-- "--ro-bind", "/lib", "/lib",
-- "--ro-bind", "/lib64", "/lib64",
-+ "@bubblewrap_bin@",
-+ "--ro-bind", "/nix/store", "/nix/store",
- "--proc", "/proc",
- "--dev", "/dev",
-- "--symlink", "usr/bin", "/bin",
-- "--symlink", "usr/sbin", "/sbin",
- "--chdir", "/",
- "--setenv", "GIO_USE_VFS", "local",
- "--unshare-all",
+- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
+- NULL);
++ "@bubblewrap_bin@",
++ "--ro-bind", "/nix/store", "/nix/store",
++ NULL);
+
+ /* These directories might be symlinks into /usr/... */
+ for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++)
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index b98a6a2d676f..6161ccde675a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gnome-desktop-${version}";
- version = "3.30.2";
+ version = "3.30.2.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal";
+ sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v";
};
enableParallelBuilding = true;