forked from mirrors/nixpkgs
startkde: Qt 5.4 is here
This commit is contained in:
parent
c918f57ebb
commit
29808a11b6
|
@ -63,15 +63,8 @@ fi
|
||||||
# * Then ksmserver is started which takes control of the rest of the startup sequence
|
# * Then ksmserver is started which takes control of the rest of the startup sequence
|
||||||
|
|
||||||
# We need to create config folder so we can write startupconfigkeys
|
# We need to create config folder so we can write startupconfigkeys
|
||||||
if [ ${XDG_CONFIG_HOME} ]; then
|
configDir=$(@qt5@/bin/qtpaths --writable-path GenericConfigLocation)
|
||||||
configDir=$XDG_CONFIG_HOME;
|
mkdir -p "$configDir"
|
||||||
else
|
|
||||||
# This is the default
|
|
||||||
# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
|
||||||
configDir=${HOME}/.config;
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p $configDir
|
|
||||||
|
|
||||||
# This is basically setting defaults so we can use them with kstartupconfig5
|
# This is basically setting defaults so we can use them with kstartupconfig5
|
||||||
cat @startupconfigkeys@ >$configDir/startupconfigkeys
|
cat @startupconfigkeys@ >$configDir/startupconfigkeys
|
||||||
|
@ -177,8 +170,7 @@ fi
|
||||||
# For anything else (that doesn't set env vars, or that needs a window manager),
|
# For anything else (that doesn't set env vars, or that needs a window manager),
|
||||||
# better use the Autostart folder.
|
# better use the Autostart folder.
|
||||||
|
|
||||||
# TODO: Use GenericConfigLocation once we depend on Qt 5.4
|
scriptpath=$(@qt5@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
|
||||||
scriptpath=`@qt5@/bin/qtpaths --paths ConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g'`
|
|
||||||
|
|
||||||
# Add /env/ to the directory to locate the scripts to be sourced
|
# Add /env/ to the directory to locate the scripts to be sourced
|
||||||
for prefix in `echo $scriptpath`; do
|
for prefix in `echo $scriptpath`; do
|
||||||
|
|
Loading…
Reference in a new issue