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

pantheon.elementary-session-settings: add default settings to config dirs

Browse Source 
Also don't use placeholder in the executable.
This commit is contained in:
worldofpeace 2019-02-25 21:11:39 -05:00 committed by Jan Tojnar
parent 513e8de83b
commit a62a8aaa14
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@
, onboard , onboard
, at-spi2-core , at-spi2-core
, elementary-default-settings , elementary-default-settings
, writeShellScriptBin
, elementary-settings-daemon , elementary-settings-daemon
, runtimeShell , runtimeShell
}: }:
@ -50,9 +49,9 @@ let
script = dockitems-script; script = dockitems-script;
}; };
executable = writeShellScriptBin "pantheon" '' executable = writeScript "pantheon" ''
export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:$XDG_CONFIG_DIRS export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:${elementary-default-settings}/etc:$XDG_CONFIG_DIRS
export XDG_DATA_DIRS=${placeholder "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 --session=pantheon "$@"
''; '';
@ -95,13 +94,17 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/gnome-session/sessions mkdir -p $out/share/gnome-session/sessions
cp -av gnome-session/pantheon.session $out/share/gnome-session/sessions cp -av gnome-session/pantheon.session $out/share/gnome-session/sessions
mkdir -p $out/libexec
substitute ${executable} $out/libexec/pantheon --subst-var out
chmod +x $out/libexec/pantheon
mkdir -p $out/share/xsessions mkdir -p $out/share/xsessions
cp -av xsessions/pantheon.desktop $out/share/xsessions cp -av xsessions/pantheon.desktop $out/share/xsessions
''; '';
postFixup = '' postFixup = ''
substituteInPlace $out/share/xsessions/pantheon.desktop \ substituteInPlace $out/share/xsessions/pantheon.desktop \
--replace "gnome-session --session=pantheon" "${executable}/bin/pantheon" \ --replace "gnome-session --session=pantheon" "$out/libexec/pantheon" \
--replace "wingpanel" "${wingpanel}/bin/wingpanel" --replace "wingpanel" "${wingpanel}/bin/wingpanel"
for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done