diff options
author | Doron Behar <doron.behar@gmail.com> | 2020-09-25 16:22:37 +0300 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-24 01:17:00 +0200 |
commit | bdbf92601749277cf5db56210feff3eeffd065ef (patch) | |
tree | dca13faaed1433a281d6172c7c65f5053c5705cf /pkgs/desktops | |
parent | 8ae59fa5c9b536136856ec6a2d96dcc1886595b6 (diff) | |
download | nixpkgs-bdbf92601749277cf5db56210feff3eeffd065ef.tar nixpkgs-bdbf92601749277cf5db56210feff3eeffd065ef.tar.gz nixpkgs-bdbf92601749277cf5db56210feff3eeffd065ef.tar.bz2 nixpkgs-bdbf92601749277cf5db56210feff3eeffd065ef.tar.lz nixpkgs-bdbf92601749277cf5db56210feff3eeffd065ef.tar.xz nixpkgs-bdbf92601749277cf5db56210feff3eeffd065ef.tar.zst nixpkgs-bdbf92601749277cf5db56210feff3eeffd065ef.zip |
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.
Diffstat (limited to 'pkgs/desktops')
4 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index fe158312771..6c2713ee7f5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchFromGitLab , stdenv , substituteAll , accountsservice @@ -74,6 +75,10 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nmi5mf7bffjyb7sd6kcv151j0mfmlqpzy2spaaxhf4wxywbbdpn"; }; + # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html + prePatch = (import ../gvc-with-ucm-prePatch.nix { + inherit fetchFromGitLab; + }); nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 1dee170bd0a..0be77e56f6e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,4 +1,5 @@ { stdenv +, fetchFromGitLab , substituteAll , fetchurl , meson @@ -47,6 +48,11 @@ stdenv.mkDerivation rec { sha256 = "0bkrsqzyrxvnw2x1p2a67k3f692ih3i5pafnxqn1kbcsmdgmpvdp"; }; + # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html + prePatch = (import ../gvc-with-ucm-prePatch.nix { + inherit fetchFromGitLab; + }); + patches = [ (substituteAll { src = ./fix-paths.patch; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 4d578160c8c..cc8430d0b8a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchFromGitLab , fetchpatch , substituteAll , stdenv @@ -77,6 +78,11 @@ stdenv.mkDerivation rec { sha256 = "15qabakial0jcsqkq1xg4fsssarixq6aqqksikdfcpl7q0xl09n6"; }; + # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html + prePatch = (import ../gvc-with-ucm-prePatch.nix { + inherit fetchFromGitLab; + }); + patches = [ # Hardcode paths to various dependencies so that they can be found at runtime. (substituteAll { diff --git a/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix b/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix new file mode 100644 index 00000000000..b2db2baf025 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix @@ -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 +'' |