diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-03-23 13:37:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 13:37:10 -0400 |
| commit | a82c39f17829ecba50b1783f6462552991e84500 (patch) | |
| tree | df056e6a99ac3034e4bfbc7b76d879cba6a39f24 /pkgs/desktops/mate | |
| parent | ca3e516e3815e3833eea198c3a949562a20e6593 (diff) | |
| parent | af73425b825c18fa923ca6abf7fd6293ac8a306e (diff) | |
| download | nixpkgs-a82c39f17829ecba50b1783f6462552991e84500.tar nixpkgs-a82c39f17829ecba50b1783f6462552991e84500.tar.gz nixpkgs-a82c39f17829ecba50b1783f6462552991e84500.tar.bz2 nixpkgs-a82c39f17829ecba50b1783f6462552991e84500.tar.lz nixpkgs-a82c39f17829ecba50b1783f6462552991e84500.tar.xz nixpkgs-a82c39f17829ecba50b1783f6462552991e84500.tar.zst nixpkgs-a82c39f17829ecba50b1783f6462552991e84500.zip | |
Merge pull request #80066 from worldofpeace/mate-upstream
nixos/mate: use upstream session
Diffstat (limited to 'pkgs/desktops/mate')
| -rw-r--r-- | pkgs/desktops/mate/mate-session-manager/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 1db0947bf2a..09973e04bc0 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, - wrapGAppsHook + wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3"; }; + patches = [ + # allow turning on debugging from environment variable + (fetchpatch { + url = "https://github.com/mate-desktop/mate-session-manager/commit/3ab6fbfc811d00100d7a2959f8bbb157b536690d.patch"; + sha256 = "0yjaklq0mp44clymyhy240kxlw95z3azmravh4f5pfm9dys33sg0"; + }) + ]; + nativeBuildInputs = [ pkgconfig gettext @@ -33,6 +41,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postFixup = '' + substituteInPlace $out/share/xsessions/mate.desktop \ + --replace "Exec=mate-session" "Exec=$out/bin/mate-session" \ + --replace "TryExec=mate-session" "TryExec=$out/bin/mate-session" + ''; + + passthru.providedSessions = [ "mate" ]; + meta = with stdenv.lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; |