mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 07:31:20 +00:00
Merge pull request #56174 from worldofpeace/gnome-updates
assorted gnome updates
This commit is contained in:
commit
6a6e7f9e2e
|
@ -9,13 +9,13 @@
|
|||
|
||||
let
|
||||
pname = "gnome-control-center";
|
||||
version = "3.30.2";
|
||||
version = "3.30.3";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0rn4r0ng4pd9smpay4rf4dkcl09b2ipr9srryybhd1srmd02ps51";
|
||||
sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -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++)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
let
|
||||
pname = "gnome-online-accounts";
|
||||
version = "3.30.1";
|
||||
version = "3.30.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0havx26cfy0ln17jzmzbrrx35afknv2s9mdy34j0p7wmbqr8m5ky";
|
||||
sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "dev" "devdoc" ];
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3 }:
|
||||
{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk_pixbuf }:
|
||||
|
||||
let
|
||||
pname = "clutter-gst";
|
||||
version = "3.0.26";
|
||||
version = "3.0.27";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq";
|
||||
sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ clutter gtk3 glib cogl ];
|
||||
propagatedBuildInputs = [ clutter gtk3 glib cogl gdk_pixbuf ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
postBuild = "rm -rf $out/share/gtk-doc";
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgit2-glib";
|
||||
version = "0.27.7";
|
||||
version = "0.27.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1hpgs8dx0dk25mc8jsizi2cwwhnmahrn3dyry9p7a1g48mnxyc8i";
|
||||
sha256 = "0d8rwgf69424ijy6fjbk3m863y9ml5bq7mshlqw7xqk9zngdd6f1";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgnomekbd";
|
||||
version = "3.26.0";
|
||||
version = "3.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875";
|
||||
sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
Loading…
Reference in a new issue