diff options
| author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-09-25 19:18:27 -0400 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-24 01:17:01 +0200 |
| commit | f971cbe31d65608a64acd4c4f6a420a5885ef5fd (patch) | |
| tree | f472e0fe3a3aeadf23360718d1458776212ae1b5 | |
| parent | 00d2ae41c5e2d645be0561c39470d57503609990 (diff) | |
| download | nixpkgs-f971cbe31d65608a64acd4c4f6a420a5885ef5fd.tar nixpkgs-f971cbe31d65608a64acd4c4f6a420a5885ef5fd.tar.gz nixpkgs-f971cbe31d65608a64acd4c4f6a420a5885ef5fd.tar.bz2 nixpkgs-f971cbe31d65608a64acd4c4f6a420a5885ef5fd.tar.lz nixpkgs-f971cbe31d65608a64acd4c4f6a420a5885ef5fd.tar.xz nixpkgs-f971cbe31d65608a64acd4c4f6a420a5885ef5fd.tar.zst nixpkgs-f971cbe31d65608a64acd4c4f6a420a5885ef5fd.zip | |
gnome3.gnome-settings-daemon: use nixpkgs gnome-session-ctl
Using https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 for this.
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
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 0be77e56f6e..59833f83f6e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , substituteAll , fetchurl , meson @@ -37,6 +38,7 @@ , tzdata , nss , gcr +, gnome-session-ctl }: stdenv.mkDerivation rec { @@ -54,6 +56,12 @@ stdenv.mkDerivation rec { }); 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 { src = ./fix-paths.patch; inherit tzdata; @@ -101,6 +109,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-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 |