diff options
Diffstat (limited to 'pkgs/desktops/kde-5/plasma')
-rw-r--r-- | pkgs/desktops/kde-5/plasma/default.nix | 8 | ||||
-rw-r--r-- | pkgs/desktops/kde-5/plasma/fetch.sh | 2 | ||||
-rw-r--r-- | pkgs/desktops/kde-5/plasma/oxygen.nix | 27 | ||||
-rw-r--r-- | pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/kde-5/plasma/srcs.nix | 320 | ||||
-rwxr-xr-x | pkgs/desktops/kde-5/plasma/startkde/startkde.sh | 38 |
6 files changed, 218 insertions, 182 deletions
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index bb123fcdab44..36850824d63c 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -44,14 +44,6 @@ let inherit (srcs.breeze) src version; }; breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze = - let - version = (builtins.parseDrvName breeze-qt5.name).version; - in - symlinkJoin { - name = "breeze-${version}"; - paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]; - }; breeze-grub = callPackage ./breeze-grub.nix {}; breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh index 0809f2d66930..60928c3900d0 100644 --- a/pkgs/desktops/kde-5/plasma/fetch.sh +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.3/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix index 44a7575526f1..f880f2e3ab23 100644 --- a/pkgs/desktops/kde-5/plasma/oxygen.nix +++ b/pkgs/desktops/kde-5/plasma/oxygen.nix @@ -1,19 +1,20 @@ { - plasmaPackage, - ecm, makeQtWrapper, + plasmaPackage, kdeWrapper, + ecm, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras }: -plasmaPackage { - name = "oxygen"; - nativeBuildInputs = [ ecm makeQtWrapper ]; - propagatedBuildInputs = [ - frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons - ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/oxygen-demo5" - wrapQtProgram "$out/bin/oxygen-settings5" - ''; +let + unwrapped = plasmaPackage { + name = "oxygen"; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ + frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons + ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras + ]; + }; +in +kdeWrapper unwrapped { + targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ]; } diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix index 7e8823e2db96..8d4098ca31f2 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix @@ -38,4 +38,9 @@ plasmaPackage rec { "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg" ]; + postInstall = '' + # Display ~/Desktop contents on the desktop by default. + sed -i "$out/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ + -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/' + ''; } diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 08daf740183d..75f44f47becf 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/bluedevil-5.8.3.tar.xz"; - sha256 = "1d05bzy1za7s9mlsh1drhlgjbb7z78jayhqml3zym05igs517la6"; - name = "bluedevil-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/bluedevil-5.8.4.tar.xz"; + sha256 = "1c49f35574948q541q25wsalhdz0yji9x18hpg7lc9mb117114fq"; + name = "bluedevil-5.8.4.tar.xz"; }; }; breeze = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-5.8.3.tar.xz"; - sha256 = "0apim1byibkbqkxb1f5ra53wfr4cwmrkdsx4ls7mph4iknr5wdwp"; - name = "breeze-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-5.8.4.tar.xz"; + sha256 = "0jxlvr9yf7pilwjvzzhhx8di6a2gx8812hl08fh4lszbkdia69yw"; + name = "breeze-5.8.4.tar.xz"; }; }; breeze-grub = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-grub-5.8.3.tar.xz"; - sha256 = "01yyhwccxrkmxi95rsg9645fd0i2ca97j425q0pxci9fg93bwl8k"; - name = "breeze-grub-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-grub-5.8.4.tar.xz"; + sha256 = "1sysdw3agm568l8mc6bv7g2vhxny34h1b4k9wm36c1x1xyac72cm"; + name = "breeze-grub-5.8.4.tar.xz"; }; }; breeze-gtk = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-gtk-5.8.3.tar.xz"; - sha256 = "1wm8v4fav9crk3wn3azsylymvcg67cgncv4zx1fy8rmblikp080g"; - name = "breeze-gtk-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-gtk-5.8.4.tar.xz"; + sha256 = "127hhlxicc3rsxxi9cwcqj32w3yyi20p1sfmfk7gjnklm6zv8b0a"; + name = "breeze-gtk-5.8.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-plymouth-5.8.3.tar.xz"; - sha256 = "0gdl603kjxfrvcardinfq710j5gzzc6ky8ypzmr7myk5kl4i9gf3"; - name = "breeze-plymouth-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-plymouth-5.8.4.tar.xz"; + sha256 = "0lsdincygh75yib1nfyqnwghnpi3pwjyjvkgyza142s49vynkdkj"; + name = "breeze-plymouth-5.8.4.tar.xz"; }; }; discover = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/discover-5.8.3.tar.xz"; - sha256 = "18fqr15jw3hfbpq6ma3md89lqzmlilfbic6zd0pm9mvpmwawbjxh"; - name = "discover-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/discover-5.8.4.tar.xz"; + sha256 = "1wkwkk0cqyz9d68d9s651cjahimb9phwr7k55g6mkigdkljd18fx"; + name = "discover-5.8.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kactivitymanagerd-5.8.3.tar.xz"; - sha256 = "18nkg64i7znyk29km8clcmpg5wrd60a0nbgdb6n0cnjjyra2ljfj"; - name = "kactivitymanagerd-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kactivitymanagerd-5.8.4.tar.xz"; + sha256 = "0rb9gc584lhbqfn9q31rl1h0aqiv90b1cb5pd5rcsq6s2yz0g8i2"; + name = "kactivitymanagerd-5.8.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kde-cli-tools-5.8.3.tar.xz"; - sha256 = "02sa4l6mx6bfys44wcaf9mpfk3vrw65zzd1jx466xy0dda43kw9b"; - name = "kde-cli-tools-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kde-cli-tools-5.8.4.tar.xz"; + sha256 = "0vzb5gq94hwyzz32z5gvdrpzj3ysvsqb6k25cfc3sy93hwla3a14"; + name = "kde-cli-tools-5.8.4.tar.xz"; }; }; kdecoration = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kdecoration-5.8.3.tar.xz"; - sha256 = "0d7q16ms3vrsrwc7fql3ly7hmbyx0v35llj9z8h1k642j3ci8jca"; - name = "kdecoration-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kdecoration-5.8.4.tar.xz"; + sha256 = "06ch3871yifkimqs67z3j7rv673qw6wa01x6qnc6899rckg1kdl4"; + name = "kdecoration-5.8.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kde-gtk-config-5.8.3.tar.xz"; - sha256 = "0y3xykz8db3y92mnhbwld2wcsh4sqxacnmx899ig5xy08chqym3d"; - name = "kde-gtk-config-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kde-gtk-config-5.8.4.tar.xz"; + sha256 = "15jw7wvk3jl9rbcm2f3vx6i5mjqzibj87l85r9cr33cxaq06wdn4"; + name = "kde-gtk-config-5.8.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kdeplasma-addons-5.8.3.tar.xz"; - sha256 = "1ssk70rvfzi3a9mx514qsh5hld2v12kz3m4n7vpl9sq1fc5hq8k3"; - name = "kdeplasma-addons-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kdeplasma-addons-5.8.4.tar.xz"; + sha256 = "0f1956dppgyx313ihjv8f21lql387rzzkvmg9y9lh7yidl75gfz4"; + name = "kdeplasma-addons-5.8.4.tar.xz"; }; }; kgamma5 = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kgamma5-5.8.3.tar.xz"; - sha256 = "038i3dm6lxvlb5s6faxr5h6cw6xhymq71fnbphhbcbc1v08sa065"; - name = "kgamma5-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kgamma5-5.8.4.tar.xz"; + sha256 = "1r5mzdk2givjmq5j374hgbf17jni4n7836pli2vka4qbjbrlzfg1"; + name = "kgamma5-5.8.4.tar.xz"; }; }; khotkeys = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/khotkeys-5.8.3.tar.xz"; - sha256 = "0lqwsdbr38qhz79sgdg3m3wx70f6ys4bv8mhnczfs06mchzm6zy9"; - name = "khotkeys-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/khotkeys-5.8.4.tar.xz"; + sha256 = "1q766aaq1l6ihgvjxlw69kpm91ai8nbcc9qc6xnz1924p9957nl3"; + name = "khotkeys-5.8.4.tar.xz"; }; }; kinfocenter = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kinfocenter-5.8.3.tar.xz"; - sha256 = "1hs9yg15rhhm2lra472wq9f1ca7aj6wsd6drb538mdma53mz21pv"; - name = "kinfocenter-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kinfocenter-5.8.4.tar.xz"; + sha256 = "1mnvp4bkhvmpqfqjag46fcx0kr7w8mq29djqlfd9akypqmzszbvd"; + name = "kinfocenter-5.8.4.tar.xz"; }; }; kmenuedit = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kmenuedit-5.8.3.tar.xz"; - sha256 = "06zji52iw8d18nda87xh54d7q94aqddrfgp3i9lsir50bgabqnc7"; - name = "kmenuedit-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kmenuedit-5.8.4.tar.xz"; + sha256 = "0wm40swxarnzv7hs11r1wmj6b0yjby3sxk8n59z6s2zza64n6n8h"; + name = "kmenuedit-5.8.4.tar.xz"; }; }; kscreen = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kscreen-5.8.3.tar.xz"; - sha256 = "07mldxxxna1y8ngam8l2h3bs1plvfgqhzj95ryprsfypls7pj1ny"; - name = "kscreen-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kscreen-5.8.4.tar.xz"; + sha256 = "1j43gzxv9j4fjszc839968vmlsrqg7bapwvjnwfc3mc8z2w7a6hl"; + name = "kscreen-5.8.4.tar.xz"; }; }; kscreenlocker = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kscreenlocker-5.8.3.tar.xz"; - sha256 = "039i01c48g3grfm6vn5zmgaazlv4lln8w3rx8d107rlfqslfq4gv"; - name = "kscreenlocker-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kscreenlocker-5.8.4.tar.xz"; + sha256 = "1n4wbzfi2h9lxj8g1qii43q205by1bqv48xxyr871mmmikxrk6qv"; + name = "kscreenlocker-5.8.4.tar.xz"; }; }; ksshaskpass = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/ksshaskpass-5.8.3.tar.xz"; - sha256 = "0kvfnzbq6y9vs1a9yn3hf0cxbwdfs0mw440gsgjgbpmamnv4xpkj"; - name = "ksshaskpass-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/ksshaskpass-5.8.4.tar.xz"; + sha256 = "033mjmry0hbz2daa9w0i2drxrdjyraynxhlnq0b331b6klxhzczc"; + name = "ksshaskpass-5.8.4.tar.xz"; }; }; ksysguard = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/ksysguard-5.8.3.tar.xz"; - sha256 = "0a1mfm0gfsi1b79c7m62rk8pp6fsbvrqhv5b07rasapn53zwr6zd"; - name = "ksysguard-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/ksysguard-5.8.4.tar.xz"; + sha256 = "1hmj32c2jzvk6fwbvdh3ij1651bfslfqhy52y79mc6q816wm7fv3"; + name = "ksysguard-5.8.4.tar.xz"; }; }; kwallet-pam = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwallet-pam-5.8.3.tar.xz"; - sha256 = "1lbmzi0pimp2pw4g0dmrw0vpb2mmm64akzjzv0l72i6f4sylsqpd"; - name = "kwallet-pam-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwallet-pam-5.8.4.tar.xz"; + sha256 = "149qwri47yjv85abfv48232ldvl464df4id9gz0kwjp3cd5n12cn"; + name = "kwallet-pam-5.8.4.tar.xz"; }; }; kwayland-integration = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwayland-integration-5.8.3.tar.xz"; - sha256 = "1w717601ivpnfvjprlyh0qvcj61m8nh9qpsqmhsy7993jvm8wal4"; - name = "kwayland-integration-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwayland-integration-5.8.4.tar.xz"; + sha256 = "1s3jy3bb15v49w9ym5d9x352lf57dsg72xqmw3w2jbvmmyacg2a7"; + name = "kwayland-integration-5.8.4.tar.xz"; }; }; kwin = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwin-5.8.3.tar.xz"; - sha256 = "0a3z17f1ma6yspbs4wyj1cp17hglf4xj1pmwya6nbf08d6gbxq1w"; - name = "kwin-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwin-5.8.4.tar.xz"; + sha256 = "1zglmz2c2aiw46vm813m5hznqjx1phs90djlva9vcvv5rvz7y3fn"; + name = "kwin-5.8.4.tar.xz"; }; }; kwrited = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwrited-5.8.3.tar.xz"; - sha256 = "0s2fsxyw6x664pirbvkd5zf0zazhx9yxzv2xk8d8cb8gfbj32cc9"; - name = "kwrited-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwrited-5.8.4.tar.xz"; + sha256 = "055054i96yxi2pb5lg42d6yjhvwqc5vgqnrczh8f5g6j3ykl6p7s"; + name = "kwrited-5.8.4.tar.xz"; }; }; libkscreen = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/libkscreen-5.8.3.tar.xz"; - sha256 = "09jakk3yrnp0vf2dihalm08lndcvp18c6c4qjr1bg65cjij9fvx7"; - name = "libkscreen-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/libkscreen-5.8.4.tar.xz"; + sha256 = "1vrh4ympdgnvnrl7c4l3hizxza05y0dr4ii6h109r8iqfhbis56p"; + name = "libkscreen-5.8.4.tar.xz"; }; }; libksysguard = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/libksysguard-5.8.3.tar.xz"; - sha256 = "11601hlrm6lm0vrw2icx2778g6yzd9fsgpa8s8rdwr0qw9i0wacy"; - name = "libksysguard-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/libksysguard-5.8.4.tar.xz"; + sha256 = "0mc045qvkzsk1rhvasysbjcqvsm9nvmgha6ljsfn61gnwpb3fjzq"; + name = "libksysguard-5.8.4.tar.xz"; }; }; milou = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/milou-5.8.3.tar.xz"; - sha256 = "03vr8ndr14ak111gq0hwlq4b5g1hwhbh3vk5b3xrk13bhxg6nfsl"; - name = "milou-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/milou-5.8.4.tar.xz"; + sha256 = "169bcdgbqddmfzz39wdy5cbqqm8djayr3bxn8j28pjkc4l8i93c8"; + name = "milou-5.8.4.tar.xz"; }; }; oxygen = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/oxygen-5.8.3.tar.xz"; - sha256 = "0ircd8v5khgmpigazxy7pykiqk8maah28ypsh3z66aim0ni4h3jg"; - name = "oxygen-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/oxygen-5.8.4.tar.xz"; + sha256 = "1g8zm71k31smyzxc1kmvcl889ljfv6l0ks6g9888qyyzhbqps2p4"; + name = "oxygen-5.8.4.tar.xz"; }; }; plasma-desktop = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-desktop-5.8.3.tar.xz"; - sha256 = "0pkjkhwqgin203dkl5clnvc9l9jnk7dqaxh7h7rbc8d5bfjiwzg7"; - name = "plasma-desktop-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-desktop-5.8.4.tar.xz"; + sha256 = "07dw8x74j0am52rxvig0jcwhlk3kx762hfw3vk6innjfcrkjx43q"; + name = "plasma-desktop-5.8.4.tar.xz"; }; }; plasma-integration = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-integration-5.8.3.tar.xz"; - sha256 = "196gxymfbrdjravgqk2ia2fpanim4l08a0vh5r13ppm7q7vzwz23"; - name = "plasma-integration-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-integration-5.8.4.tar.xz"; + sha256 = "18w4ws0ydqf0lfd16svgs1sbf2q6rc1zkzfhxwj2jzdhqjqwdikn"; + name = "plasma-integration-5.8.4.tar.xz"; }; }; plasma-nm = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-nm-5.8.3.tar.xz"; - sha256 = "1rsj0gl9plza7ykkp161ipvxlax67vdvns0fnq34sk9hg7s5ckb7"; - name = "plasma-nm-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-nm-5.8.4.tar.xz"; + sha256 = "0dzk6wa6dsw9mlwxvhyhq8dmk88ia9paavcnw0am165ahpmkpzjq"; + name = "plasma-nm-5.8.4.tar.xz"; }; }; plasma-pa = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-pa-5.8.3.tar.xz"; - sha256 = "1l3xdcrkvjpmmbzvyhqrs6y8xhkz5k1xkxlm3d3bx4x0mn24qmq4"; - name = "plasma-pa-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-pa-5.8.4.tar.xz"; + sha256 = "1p7f7ahr4xc50cn9iawkpq0xna7s7zar8vlkvizgji566sp1yf4i"; + name = "plasma-pa-5.8.4.tar.xz"; }; }; plasma-sdk = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-sdk-5.8.3.tar.xz"; - sha256 = "1jgv6yf7m9x2869cprbg2r9ka56ypmprvvznagb4zrjnjfdnqrm7"; - name = "plasma-sdk-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-sdk-5.8.4.tar.xz"; + sha256 = "0nkrppv15l4v2f9g3ihixmgya1ky2zrih1ynak7kqkv43d4827s9"; + name = "plasma-sdk-5.8.4.tar.xz"; }; }; plasma-tests = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-tests-5.8.3.tar.xz"; - sha256 = "1aidrc3wi3z7lap5m193xqcahl0p2pdg9hddygzq6dr46r1ipbi4"; - name = "plasma-tests-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-tests-5.8.4.tar.xz"; + sha256 = "0hh8rp7sw8lyc61pizhc64138sv41iv9gnn0flbblvd912990i6k"; + name = "plasma-tests-5.8.4.tar.xz"; }; }; plasma-workspace = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-5.8.3.tar.xz"; - sha256 = "16h5flf346lwrdl35clkq0qv3i0fa4clxyyn3dvpsp9mvxdlabwb"; - name = "plasma-workspace-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-5.8.4.tar.xz"; + sha256 = "1hwdrwc43s0mfy86ywws2myr1byf4d1j7x685z05cvyg3ha2wwwd"; + name = "plasma-workspace-5.8.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-wallpapers-5.8.3.tar.xz"; - sha256 = "0dy3w60d4wbm571kbv6qshmrqf6r30j53hz92kkyiwgqja18ysg2"; - name = "plasma-workspace-wallpapers-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-wallpapers-5.8.4.tar.xz"; + sha256 = "088vmni3krybg5j6bd0amfqn806pxqjnyb0pvlwbakw53yjbsva3"; + name = "plasma-workspace-wallpapers-5.8.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.8.3"; + version = "1-5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/polkit-kde-agent-1-5.8.3.tar.xz"; - sha256 = "04llryjkjzkzccfjwdhwcbkvp8wfgjfw4yabbq4kl1i2girimw0z"; - name = "polkit-kde-agent-1-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/polkit-kde-agent-1-5.8.4.tar.xz"; + sha256 = "0jh1msiaig47114ccdpxf3zl77vgs5wvbsl2vibc05i19alr99jg"; + name = "polkit-kde-agent-1-5.8.4.tar.xz"; }; }; powerdevil = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/powerdevil-5.8.3.tar.xz"; - sha256 = "1im9sxzb4c3cplplzizfxdlyg1knm94y2hj9ssllxfggy5d38ps1"; - name = "powerdevil-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/powerdevil-5.8.4.tar.xz"; + sha256 = "1b1cy98zjdc9w8jd0hqrzmvmvfxg5v6imd4pvnlgfix9bm0gcmcy"; + name = "powerdevil-5.8.4.tar.xz"; }; }; sddm-kcm = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/sddm-kcm-5.8.3.tar.xz"; - sha256 = "1cs29rb259zz06qwfhnjxzy2xzzqvfwpphz4whbyl5kn07bzah8d"; - name = "sddm-kcm-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/sddm-kcm-5.8.4.tar.xz"; + sha256 = "03d2x6hvjvwdmpcs04vs7jqp4nnvw1gmiwfra5xk432argf0nxyx"; + name = "sddm-kcm-5.8.4.tar.xz"; }; }; systemsettings = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/systemsettings-5.8.3.tar.xz"; - sha256 = "0shac5659h928p2kq053kllw66j3sw6a06kczgck5lq28kxwh3mm"; - name = "systemsettings-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/systemsettings-5.8.4.tar.xz"; + sha256 = "1j45yvvm8lx1nvwzq2x979s5x3k4i3phjcw73hxyqv9x7y0pnchv"; + name = "systemsettings-5.8.4.tar.xz"; }; }; user-manager = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/user-manager-5.8.3.tar.xz"; - sha256 = "0kh9knr2rfrhakzdyf94cap19v21ciglammdp4svyql7drwfvq8v"; - name = "user-manager-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/user-manager-5.8.4.tar.xz"; + sha256 = "0m2yv7qlj0y95z5x3f008aww3jzrs5lf32k9czqia3fyy9szpa1d"; + name = "user-manager-5.8.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index 256f9949e834..63c62f12321e 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -6,6 +6,36 @@ export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@" export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@" export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@" +# Set the default GTK 2 theme +if ! [ -e $HOME/.gtkrc-2.0 ] \ + && [ -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then + cat >$HOME/.gtkrc-2.0 <<EOF +# Default GTK+ 2 config for NixOS KDE 5 +include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" +gtk-theme-name="Breeze" +gtk-icon-theme-name="breeze" +gtk-fallback-icon-theme="hicolor" +gtk-cursor-theme-name="breeze_cursors" +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-menu-images=1 +gtk-button-images=1 +EOF +fi + +if ! [ -e $HOME/.config/gtk-3.0/settings.ini ] \ + && [ -e /run/current-system/sw/share/themes/Breeze/gtk-3.0 ]; then + cat >$HOME/.config/gtk-3.0/settings.ini <<EOF +[Settings] +gtk-theme-name=Breeze +gtk-icon-theme-name=breeze +gtk-fallback-icon-theme=hicolor +gtk-cursor-theme-name=breeze_cursors +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-menu-images=1 +gtk-button-images=1 +EOF +fi + # 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 @@ -71,6 +101,14 @@ fi configDir=$(qtpaths --writable-path GenericConfigLocation) mkdir -p "$configDir" +if ! [ -e $configDir/kcminputrc ]; then + cat >$configDir/kcminputrc <<EOF +[Mouse] +cursorTheme=breeze_cursors +cursorSize=0 +EOF +fi + THEME=org.kde.breeze #This is basically setting defaults so we can use them with kstartupconfig5 #We cannot set the equivilant of THEME here as it will generate an |