mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #75589 from hedning/gnome-3.34.2

Browse source 
gnome-shell 3.34.2
This commit is contained in:
Tor Hedin Brønner 2019-12-14 17:46:13 +01:00 committed by GitHub
parent e69c094227 39634ac2b8
commit e76e230f99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View file

@ -15,11 +15,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gnome-shell"; pname = "gnome-shell";
version = "3.34.1"; version = "3.34.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07kd7wdk12nba33jfr44xqdlryiy86wgvsyjs8cw55y8p5cnbn6c"; sha256 = "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh";
}; };
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";

15
pkgs/desktops/gnome-3/core/mutter/default.nix
View file

@ -42,13 +42,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mutter"; pname = "mutter";
version = "3.34.1"; version = "3.34.2";
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13kmmgg2zizr0522clwc2zn3bkwbir503b1wjiiixf5xi37jc65s"; sha256 = "0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd";
}; };
mesonFlags = [ mesonFlags = [
@ -105,17 +105,6 @@ stdenv.mkDerivation rec {
]; ];
patches = [ patches = [
# Fixes from gnome-3-34 branch 2019-11-29.
(fetchpatch {
name = "gnome-3-34-2019-11-29.patch";
url = "https://github.com/GNOME/mutter/compare/3.34.1...c0e76186da5b7baf7c8804c0ffa80232a5a6bf98.patch";
excludes = [
".gitlab-ci.yml"
".gitlab-ci/checkout-gnome-shell.sh"
];
sha256 = "1qmxic83bd3dvg6isipqy8jaaksd7p5s3cb7h44zinq738n8d0fb";
})
# Fix build with libglvnd provided headers # Fix build with libglvnd provided headers
(fetchpatch { (fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch";