diff options
| author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-09-25 19:50:47 -0400 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-24 01:17:01 +0200 |
| commit | 934b20866a05b46f8d7ca889e0983874476bd365 (patch) | |
| tree | b39caff04a64cbf7134e2d92c521fc2fa54e0e80 /pkgs | |
| parent | f971cbe31d65608a64acd4c4f6a420a5885ef5fd (diff) | |
gnome3.gnome-session: use provided gnome-session-ctl
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-session/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 3be0a51016db7..4684f3ebee0b7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 -, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }: +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: stdenv.mkDerivation rec { pname = "gnome-session"; @@ -39,6 +39,14 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py + + # Use our provided `gnome-session-ctl` + original="@libexecdir@/gnome-session-ctl" + replacement="${gnome-session-ctl}/libexec/gnome-session-ctl" + + find data/ -type f -name "*.service.in" -exec sed -i \ + -e s,$original,$replacement,g \ + {} + ''; # `bin/gnome-session` will reset the environment when run in wayland, we @@ -59,6 +67,9 @@ stdenv.mkDerivation rec { mkdir $sessions moveToOutput share/wayland-sessions "$sessions" moveToOutput share/xsessions "$sessions" + + # Our provided one is being used + rm -rf $out/libexec/gnome-session-ctl ''; passthru = { |