diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-14 16:34:45 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-20 10:01:06 -0500 |
commit | 2780894b1bf8d9541ad024fdbb8694e887ddd649 (patch) | |
tree | aca09e38d0356f74e1bc7ddfeaf66929bcff87de /pkgs/desktops/kde-5 | |
parent | 468d0bc56a8510f84969c0306d927ae0d7813782 (diff) | |
download | nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.gz nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.bz2 nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.lz nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.xz nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.zst nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.zip |
kde5.startkde: init at 5.5.5
Diffstat (limited to 'pkgs/desktops/kde-5')
5 files changed, 376 insertions, 27 deletions
diff --git a/pkgs/desktops/kde-5/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.5/default.nix index 384fa6f6d27..a4f5c7c2320 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.5/default.nix @@ -81,6 +81,7 @@ let plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; powerdevil = callPackage ./powerdevil.nix {}; + startkde = callPackage ./startkde {}; systemsettings = callPackage ./systemsettings.nix {}; }; diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix index 30bd264ddcd..1d67761d244 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix @@ -1,14 +1,12 @@ { plasmaPackage, lib, copyPathsToStore -, extra-cmake-modules, kdoctools, makeQtWrapper +, extra-cmake-modules, kdoctools , baloo, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative , kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime , kjsembed, knewstuff, knotifyconfig, kpackage, krunner , ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient , libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt , pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland -, libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig -, kinit, kservice, qttools, dbus_tools, mkfontdir, xmessage -, xprop, xrdb, xset, xsetroot, solid, qtquickcontrols +, libksysguard, kconfig, solid, qtquickcontrols }: plasmaPackage { @@ -17,7 +15,6 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools - makeQtWrapper ]; buildInputs = [ dbus_tools kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit @@ -35,32 +32,12 @@ plasmaPackage { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postPatch = '' - substituteInPlace startkde/startkde.cmake \ - --subst-var-by bash $(type -P bash) \ - --subst-var-by sed $(type -P sed) \ - --subst-var-by grep $(type -P grep) \ - --subst-var-by socat $(type -P socat) \ - --subst-var-by kcheckrunning $(type -P kcheckrunning) \ - --subst-var-by xmessage $(type -P xmessage) \ - --subst-var-by tr $(type -P tr) \ - --subst-var-by qtpaths $(type -P qtpaths) \ - --subst-var-by qdbus $(type -P qdbus) \ - --subst-var-by dbus-launch $(type -P dbus-launch) \ - --subst-var-by mkfontdir $(type -P mkfontdir) \ - --subst-var-by xset $(type -P xset) \ - --subst-var-by xsetroot $(type -P xsetroot) \ - --subst-var-by xprop $(type -P xprop) \ - --subst-var-by start_kdeinit_wrapper "${kinit.out}/lib/libexec/kf5/start_kdeinit_wrapper" \ - --subst-var-by kwrapper5 $(type -P kwrapper5) \ - --subst-var-by kdeinit5_shutdown $(type -P kdeinit5_shutdown) \ - --subst-var-by kbuildsycoca5 $(type -P kbuildsycoca5) \ - --subst-var-by kreadconfig5 $(type -P kreadconfig5) \ - --subst-var out substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ --replace kdostartupconfig5 $out/bin/kdostartupconfig5 ''; postInstall = '' + rm "$out/bin/startkde" rm "$out/bin/startplasmacompositor" rm "$out/lib/libexec/startplasma" rm -r "$out/share/wayland-sessions" diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series index 88b54af793e..b9081298bd6 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series +++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series @@ -1,2 +1 @@ -startkde.patch qml-import-path.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix b/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix new file mode 100644 index 00000000000..13e248c0fb7 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, runCommand +, dbus +, gnugrep, gnused +, kconfig, kinit, kservice +, plasma-workspace +, qttools +, socat +, xmessage, xprop, xsetroot +}: + +let + + env = { + inherit (stdenv) shell; + paths = [ + dbus.tools + gnugrep gnused + kconfig kinit kservice + plasma-workspace + qttools + socat + xmessage xprop xsetroot + ]; + }; + +in runCommand "startkde" env '' + prefix_PATH= + for pkg in $paths; do + addToSearchPath prefix_PATH "$pkg/bin" + addToSearchPath prefix_PATH "$pkg/lib/libexec" + addToSearchPath prefix_PATH "$pkg/lib/libexec/kf5" + done + substitute ${./startkde.sh} "$out" --subst-var shell --subst-var prefix_PATH + chmod +x "$out" +'' diff --git a/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh new file mode 100755 index 00000000000..be374e7504d --- /dev/null +++ b/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh @@ -0,0 +1,337 @@ +#!@shell@ + +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 +# timestamp is always the same, this doesn't work. So as +# a workaround, nuke the icon cache on login. This isn't +# perfect, since it may require logging out after +# installing new applications to update the cache. +# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html +rm -fv $HOME/.cache/icon-cache.kcache + +# Qt writes a weird ‘libraryPath’ line to +# ~/.config/Trolltech.conf that causes the KDE plugin +# paths of previous KDE invocations to be searched. +# Obviously using mismatching KDE libraries is potentially +# disastrous, so here we nuke references to the Nix store +# in Trolltech.conf. A better solution would be to stop +# Qt from doing this wackiness in the first place. +if [ -e $HOME/.config/Trolltech.conf ]; then + sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf +fi + +if test "x$1" = x--failsafe; then + KDE_FAILSAFE=1 # General failsafe flag + KWIN_COMPOSE=N # Disable KWin's compositing + QT_XCB_FORCE_SOFTWARE_OPENGL=1 + export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL +fi + +# When the X server dies we get a HUP signal from xinit. We must ignore it +# because we still need to do some cleanup. +trap 'echo GOT SIGHUP' HUP + +# we have to unset this for Darwin since it will screw up KDE's dynamic-loading +unset DYLD_FORCE_FLAT_NAMESPACE + +# Check if a KDE session already is running and whether it's possible to connect to X +kcheckrunning +kcheckrunning_result=$? +if test $kcheckrunning_result -eq 0 ; then + echo "KDE seems to be already running on this display." + xmessage -geometry 500x100 "KDE seems to be already running on this display." + exit 1 +elif test $kcheckrunning_result -eq 2 ; then + echo "\$DISPLAY is not set or cannot connect to the X server." + exit 1 +fi + +# Boot sequence: +# +# kdeinit is used to fork off processes which improves memory usage +# and startup time. +# +# * kdeinit starts klauncher first. +# * Then kded is started. kded is responsible for keeping the sycoca +# database up to date. When an up to date database is present it goes +# into the background and the startup continues. +# * Then kdeinit starts kcminit. kcminit performs initialisation of +# certain devices according to the user's settings +# +# * 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 +configDir=$(qtpaths --writable-path GenericConfigLocation) +mkdir -p "$configDir" + +#This is basically setting defaults so we can use them with kstartupconfig5 +cat >$configDir/startupconfigkeys <<EOF +kcminputrc Mouse cursorTheme 'breeze_cursors' +kcminputrc Mouse cursorSize '' +ksplashrc KSplash Theme Breeze +ksplashrc KSplash Engine KSplashQML +kdeglobals KScreen ScaleFactor 1 +kcmfonts General forceFontDPI 0 +EOF + +# preload the user's locale on first start +plasmalocalerc=$configDir/plasma-localerc +test -f $plasmalocalerc || { +cat >$plasmalocalerc <<EOF +[Formats] +LANG=$LANG +EOF +} + +# export LC_* variables set by kcmshell5 formats into environment +# so it can be picked up by QLocale and friends. +exportformatssettings=$configDir/plasma-locale-settings.sh +test -f $exportformatssettings && { + . $exportformatssettings +} + +# Write a default kdeglobals file to set up the font +kdeglobalsfile=$configDir/kdeglobals +test -f $kdeglobalsfile || { +cat >$kdeglobalsfile <<EOF +[General] +XftAntialias=true +XftHintStyle=hintmedium +XftSubPixel=none +EOF +} + +kstartupconfig5 +returncode=$? +if test $returncode -ne 0; then + xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." + exit 1 +fi +[ -r $configDir/startupconfig ] && . $configDir/startupconfig + +if test "$kdeglobals_kscreen_scalefactor" -ne 1; then + export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor +fi + +XCURSOR_PATH=~/.icons +IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" +for xdgDir in "${xdgDirs[@]}"; do + XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" +done +export XCURSOR_PATH + +# XCursor mouse theme needs to be applied here to work even for kded or ksmserver +if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then + + kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" + if test $? -eq 10; then + XCURSOR_THEME=breeze_cursors + export XCURSOR_THEME + elif test -n "$kcminputrc_mouse_cursortheme"; then + XCURSOR_THEME="$kcminputrc_mouse_cursortheme" + export XCURSOR_THEME + fi + if test -n "$kcminputrc_mouse_cursorsize"; then + XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" + export XCURSOR_SIZE + fi +fi + +# Set a left cursor instead of the standard X11 "X" cursor, since I've heard +# from some users that they're confused and don't know what to do. This is +# especially necessary on slow machines, where starting KDE takes one or two +# minutes until anything appears on the screen. +# +# If the user has overwritten fonts, the cursor font may be different now +# so don't move this up. +# +xsetroot -cursor_name left_ptr + +dl=$DESKTOP_LOCKED +unset DESKTOP_LOCKED # Don't want it in the environment + +# Make sure that D-Bus is running +# D-Bus autolaunch is broken +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then + eval $(dbus-launch --sh-syntax --exit-with-session) +fi +if qdbus >/dev/null 2>/dev/null; then + : # ok +else + echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" + exit 1 +fi + +ksplash_pid= +if test -z "$dl"; then + # the splashscreen and progress indicator + case "$ksplashrc_ksplash_engine" in + KSplashQML) + ksplash_pid=$(ksplashqml "${ksplashrc_ksplash_theme}" --pid) + ;; + None) + ;; + *) + ;; + esac +fi + +# Source scripts found in <config locations>/plasma-workspace/env/*.sh +# (where <config locations> correspond to the system and user's configuration +# directories, as identified by Qt's qtpaths, e.g. $HOME/.config +# and /etc/xdg/ on Linux) +# +# This is where you can define environment variables that will be available to +# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` +# or eval `gpg-agent --daemon`. +# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script +# +# (see end of this file). +# For anything else (that doesn't set env vars, or that needs a window manager), +# better use the Autostart folder. + +IFS=":" read -r -a scriptpath <<< $(qtpaths --paths GenericConfigLocation) +# Add /env/ to the directory to locate the scripts to be sourced +for prefix in "${scriptpath[@]}"; do + for file in "$prefix"/plasma-workspace/env/*.sh; do + test -r "$file" && . "$file" || true + done +done + +echo 'startkde: Starting up...' 1>&2 + +# Mark that full KDE session is running (e.g. Konqueror preloading works only +# with full KDE running). The KDE_FULL_SESSION property can be detected by +# any X client connected to the same X session, even if not launched +# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION +# however guarantees that the application is launched in the same environment +# like the KDE session and that e.g. KDE utilities/libraries are available. +# KDE_FULL_SESSION property is also only available since KDE 3.5.5. +# The matching tests are: +# For $KDE_FULL_SESSION: +# if test -n "$KDE_FULL_SESSION"; then ... whatever +# For KDE_FULL_SESSION property: +# xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null +# if test $? -eq 0; then ... whatever +# +# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid +# of the user running the KDE session. It should be rarely needed (e.g. +# after sudo to prevent desktop-wide functionality in the new user's kded). +# +# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number. +# Note that this didn't exist in KDE3, which can be detected by its absense and +# the presence of KDE_FULL_SESSION. +# +KDE_FULL_SESSION=true +export KDE_FULL_SESSION +xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true + +KDE_SESSION_VERSION=5 +export KDE_SESSION_VERSION +xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 + +KDE_SESSION_UID=`id -ru` +export KDE_SESSION_UID + +XDG_CURRENT_DESKTOP=KDE +export XDG_CURRENT_DESKTOP + +# At this point all the environment is ready, let's send it to kwalletd if running +if test -n "$PAM_KWALLET_LOGIN" ; then + env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN +fi +# ...and also to kwalletd5 +if test -n "$PAM_KWALLET5_LOGIN" ; then + env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN +fi + +# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment +ksyncdbusenv +if test $? -ne 0; then + # Startup error + echo 'startkde: Could not sync environment to dbus.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + xmessage -geometry 500x100 "Could not sync environment to dbus." + exit 1 +fi + +# We set LD_BIND_NOW to increase the efficiency of kdeinit. +# kdeinit unsets this variable before loading applications. +LD_BIND_NOW=true start_kdeinit_wrapper --kded +kcminit_startup +if test $? -ne 0; then + # Startup error + echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." + exit 1 +fi + +# (NixOS) Run kbuildsycoca5 before starting the user session because things +# may be missing or moved if they have run nixos-rebuild and it may not be +# possible for them to start Konsole to run it manually! +kbuildsycoca5 + +# finally, give the session control to the session manager +# see kdebase/ksmserver for the description of the rest of the startup sequence +# if the KDEWM environment variable has been set, then it will be used as KDE's +# window manager instead of kwin. +# if KDEWM is not set, ksmserver will ensure kwin is started. +# kwrapper5 is used to reduce startup time and memory usage +# kwrapper5 does not return useful error codes such as the exit code of ksmserver. +# We only check for 255 which means that the ksmserver process could not be +# started, any problems thereafter, e.g. ksmserver failing to initialize, +# will remain undetected. +test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" +# If the session should be locked from the start (locked autologin), +# lock now and do the rest of the KDE startup underneath the locker. +KSMSERVEROPTIONS="" +test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" +kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS +if test $? -eq 255; then + # Startup error + echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." +fi + +wait_drkonqi=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true) + +if test x"$wait_drkonqi"x = x"true"x ; then + # wait for remaining drkonqi instances with timeout (in seconds) + wait_drkonqi_timeout=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900) + wait_drkonqi_counter=0 + while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do + sleep 5 + wait_drkonqi_counter=$((wait_drkonqi_counter+5)) + if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then + # ask remaining drkonqis to die in a graceful way + qdbus | grep 'org.kde.drkonqi-' | while read address ; do + qdbus "$address" "/MainApplication" "quit" + done + break + fi + done +fi + +echo 'startkde: Shutting down...' 1>&2 +# just in case +test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + +# Clean up +kdeinit5_shutdown + +unset KDE_FULL_SESSION +xprop -root -remove KDE_FULL_SESSION +unset KDE_SESSION_VERSION +xprop -root -remove KDE_SESSION_VERSION +unset KDE_SESSION_UID + +echo 'startkde: Done.' 1>&2 |