public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gnome-<several>: Use a gvc suitable for modern laptops 

Address:
https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html

gnome3.gnome-{control-center,settings-daemon,shell} ship within their
tarball a copy of lignome-volume-control in the `subprojects/gvc/`. This
commit makes them use an updated version of it, which supports Modern
laptops with SOF for audio. Close #98470.
This commit is contained in:
Doron Behar 2020-09-25 16:22:37 +03:00 committed by Jan Tojnar
parent 8ae59fa5c9
commit bdbf926017
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View File

@ -1,4 +1,5 @@
{ fetchurl { fetchurl
, fetchFromGitLab
, stdenv , stdenv
, substituteAll , substituteAll
, accountsservice , accountsservice
@ -74,6 +75,10 @@ stdenv.mkDerivation rec {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1nmi5mf7bffjyb7sd6kcv151j0mfmlqpzy2spaaxhf4wxywbbdpn"; sha256 = "1nmi5mf7bffjyb7sd6kcv151j0mfmlqpzy2spaaxhf4wxywbbdpn";
}; };
# See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
prePatch = (import ../gvc-with-ucm-prePatch.nix {
inherit fetchFromGitLab;
});
nativeBuildInputs = [ nativeBuildInputs = [
docbook_xsl docbook_xsl

6
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv { stdenv
, fetchFromGitLab
, substituteAll , substituteAll
, fetchurl , fetchurl
, meson , meson
@ -47,6 +48,11 @@ stdenv.mkDerivation rec {
sha256 = "0bkrsqzyrxvnw2x1p2a67k3f692ih3i5pafnxqn1kbcsmdgmpvdp"; sha256 = "0bkrsqzyrxvnw2x1p2a67k3f692ih3i5pafnxqn1kbcsmdgmpvdp";
}; };
# See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
prePatch = (import ../gvc-with-ucm-prePatch.nix {
inherit fetchFromGitLab;
});
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;

6
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View File

@ -1,4 +1,5 @@
{ fetchurl { fetchurl
, fetchFromGitLab
, fetchpatch , fetchpatch
, substituteAll , substituteAll
, stdenv , stdenv
@ -77,6 +78,11 @@ stdenv.mkDerivation rec {
sha256 = "15qabakial0jcsqkq1xg4fsssarixq6aqqksikdfcpl7q0xl09n6"; sha256 = "15qabakial0jcsqkq1xg4fsssarixq6aqqksikdfcpl7q0xl09n6";
}; };
# See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
prePatch = (import ../gvc-with-ucm-prePatch.nix {
inherit fetchFromGitLab;
});
patches = [ patches = [
# Hardcode paths to various dependencies so that they can be found at runtime. # Hardcode paths to various dependencies so that they can be found at runtime.
(substituteAll { (substituteAll {

17
pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix Normal file
View File

@ -0,0 +1,17 @@
{ fetchFromGitLab }:
let
# We need a gvc different then that which is shipped in the source tarball of
# whatever package that imports this file
gvc-src-with-ucm = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "libgnome-volume-control";
rev = "7a621180b46421e356b33972e3446775a504139c";
sha256 = "07rkgh9f7qcmlpy6jqh944axzh3z38f47g48ii842f2i3a1mrbw9";
};
in
''
rm -r ./subprojects/gvc
cp -r ${gvc-src-with-ucm} ./subprojects/gvc
''