diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-15 06:10:12 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-20 10:01:06 -0500 |
| commit | f418bd2dfaa02aa4af6ee3cec64a050edfac2bcf (patch) | |
| tree | 7560c8a7e6d9b0d6dff1261e2e2003d3edaf093e /pkgs/desktops | |
| parent | b3317a020e6c961882cf99da16aa5ac8ffb762e2 (diff) | |
| download | nixlib-f418bd2dfaa02aa4af6ee3cec64a050edfac2bcf.tar nixlib-f418bd2dfaa02aa4af6ee3cec64a050edfac2bcf.tar.gz nixlib-f418bd2dfaa02aa4af6ee3cec64a050edfac2bcf.tar.bz2 nixlib-f418bd2dfaa02aa4af6ee3cec64a050edfac2bcf.tar.lz nixlib-f418bd2dfaa02aa4af6ee3cec64a050edfac2bcf.tar.xz nixlib-f418bd2dfaa02aa4af6ee3cec64a050edfac2bcf.tar.zst nixlib-f418bd2dfaa02aa4af6ee3cec64a050edfac2bcf.zip | |
kde5.startkde: fix PATH
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix | 21 | ||||
| -rwxr-xr-x | pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh | 3 |
2 files changed, 9 insertions, 15 deletions
diff --git a/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix b/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix index 13e248c0fb7c..30e986c21b4b 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix @@ -1,10 +1,8 @@ { stdenv, lib, runCommand -, dbus +, dbus, qttools, socat , gnugrep, gnused , kconfig, kinit, kservice , plasma-workspace -, qttools -, socat , xmessage, xprop, xsetroot }: @@ -12,15 +10,14 @@ let env = { inherit (stdenv) shell; - paths = [ - dbus.tools - gnugrep gnused - kconfig kinit kservice - plasma-workspace - qttools - socat - xmessage xprop xsetroot - ]; + paths = builtins.map (pkg: pkg.out or pkg) + [ + dbus qttools socat + gnugrep gnused + kconfig kinit kservice + plasma-workspace + xmessage xprop xsetroot + ]; }; in runCommand "startkde" env '' diff --git a/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh index be374e7504d9..d839226a4562 100755 --- a/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh @@ -2,9 +2,6 @@ PATH="@prefix_PATH@:$PATH" -export NIX_PROFILES -echo "NIX_PROFILES=$NIX_PROFILES" - # The KDE icon cache is supposed to update itself # automatically, but it uses the timestamp on the icon # theme directory as a trigger. Since in Nix the |