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

gnome3.gnome-settings-daemon: use nixpkgs gnome-session-ctl

Browse Source 
Using https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 for this.
This commit is contained in:
WORLDofPEACE 2020-09-25 19:18:27 -04:00 committed by Jan Tojnar
parent 00d2ae41c5
commit f971cbe31d
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, substituteAll , substituteAll
, fetchurl , fetchurl
, meson , meson
@ -37,6 +38,7 @@
, tzdata , tzdata
, nss , nss
, gcr , gcr
, gnome-session-ctl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -54,6 +56,12 @@ stdenv.mkDerivation rec {
}); });
patches = [ patches = [
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch";
sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI=";
})
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit tzdata; inherit tzdata;
@ -101,6 +109,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dudev_dir=${placeholder "out"}/lib/udev" "-Dudev_dir=${placeholder "out"}/lib/udev"
"-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
]; ];
# Default for release buildtype but passed manually because # Default for release buildtype but passed manually because