diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix index b25688ea5a9d..4684f3ebee0b 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,16 +1,16 @@ { 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"; - version = "3.36.0"; + version = "3.38.0"; outputs = ["out" "sessions"]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ymvf1bap35348rpjqp63qwnwnnawdwi4snch95zc4n832w3hjym"; + sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v"; }; patches = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - mesonFlags = [ "-Dsystemd=true" ]; + mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; nativeBuildInputs = [ meson ninja pkgconfig gettext makeWrapper @@ -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 = { |