3
0
Fork 0
forked from mirrors/nixpkgs

gnome3.gnome-desktop: 3.30.2 -> 3.30.2.1

2da71b79c8/NEWS
This commit is contained in:
worldofpeace 2019-02-21 20:03:16 -05:00
parent 522b897edb
commit 255185cc65
2 changed files with 11 additions and 14 deletions

View file

@ -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++)

View file

@ -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;