diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-02-25 21:11:39 -0500 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 00:09:17 +0200 |
| commit | a62a8aaa141ad4b1f1fa6d66c501992f8e177a10 (patch) | |
| tree | 6308a630ed086857dd058342558ddce9ae18f4b8 /pkgs | |
| parent | 513e8de83bcfd690db57e737b80816324913fe5c (diff) | |
| download | nixpkgs-a62a8aaa141ad4b1f1fa6d66c501992f8e177a10.tar nixpkgs-a62a8aaa141ad4b1f1fa6d66c501992f8e177a10.tar.gz nixpkgs-a62a8aaa141ad4b1f1fa6d66c501992f8e177a10.tar.bz2 nixpkgs-a62a8aaa141ad4b1f1fa6d66c501992f8e177a10.tar.lz nixpkgs-a62a8aaa141ad4b1f1fa6d66c501992f8e177a10.tar.xz nixpkgs-a62a8aaa141ad4b1f1fa6d66c501992f8e177a10.tar.zst nixpkgs-a62a8aaa141ad4b1f1fa6d66c501992f8e177a10.zip | |
pantheon.elementary-session-settings: add default settings to config dirs
Also don't use placeholder in the executable.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 7b0657bcd80..69a1efa3e9e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -10,7 +10,6 @@ , onboard , at-spi2-core , elementary-default-settings -, writeShellScriptBin , elementary-settings-daemon , runtimeShell }: @@ -50,9 +49,9 @@ let script = dockitems-script; }; - executable = writeShellScriptBin "pantheon" '' - export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:$XDG_CONFIG_DIRS - export XDG_DATA_DIRS=${placeholder "out"}/share:$XDG_DATA_DIRS + executable = writeScript "pantheon" '' + 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 exec ${gnome-session}/bin/gnome-session --session=pantheon "$@" ''; @@ -95,13 +94,17 @@ stdenv.mkDerivation rec { mkdir -p $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 cp -av xsessions/pantheon.desktop $out/share/xsessions ''; postFixup = '' 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" for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done |