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

pantheon.elementary-session-settings: 2020-06-11 -> 2020-07-06

Browse Source 
Because gnome-session now uses 'enabled' systemd session we have
to make this use --builtin [0]

[0]: fa15cbd83f
This commit is contained in:
WORLDofPEACE 2020-09-20 23:00:45 -04:00
parent 420f89ceb2
commit 17d7060f5d
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View File

@ -64,22 +64,33 @@ let
executable = writeScript "pantheon" '' executable = writeScript "pantheon" ''
export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:${elementary-default-settings}/etc:$XDG_CONFIG_DIRS export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:${elementary-default-settings}/etc:$XDG_CONFIG_DIRS
export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS
exec ${gnome-session}/bin/gnome-session --session=pantheon "$@" exec ${gnome-session}/bin/gnome-session --builtin --session=pantheon "$@"
'';
xsession = writeText "pantheon.desktop" ''
[Desktop Entry]
Name=Pantheon
Comment=This session provides elementary experience
Exec=@out@/libexec/pantheon
TryExec=${wingpanel}/bin/wingpanel
Icon=
DesktopNames=Pantheon
Type=Application
''; '';
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-session-settings-unstable"; pname = "elementary-session-settings-unstable";
version = "2020-06-11"; version = "2020-07-06";
repoName = "session-settings"; repoName = "session-settings";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = repoName; repo = repoName;
rev = "130c9ae221913032ed18bcf6d21e3dcdba3c4209"; rev = "fa15cbd83fba0ba30e9a302db880350bff5ace52";
sha256 = "0bzg9vbq0ssnxgcb2vxpx6x9zv8ngkm9r3ki5q83m9al9919n0pr"; hash = "sha256-26H791c7OAjFYtjVChIatICSocMt0uTej1TKBOvw+6w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -112,12 +123,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/libexec mkdir -p $out/libexec
substitute ${executable} $out/libexec/pantheon --subst-var out substitute ${executable} $out/libexec/pantheon --subst-var out
chmod +x $out/libexec/pantheon chmod +x $out/libexec/pantheon
'';
postFixup = '' substitute ${xsession} $out/share/xsessions/pantheon.desktop --subst-var out
substituteInPlace $out/share/xsessions/pantheon.desktop \
--replace "gnome-session --session=pantheon" "$out/libexec/pantheon" \
--replace "wingpanel" "${wingpanel}/bin/wingpanel"
''; '';
passthru = { passthru = {