tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
plasma53.plasma-workspace: fix path to kapplymousetheme
Thomas Tuegel
10 years ago
2faa29d1
9899ce47
+6
-2
1 changed file
expand all
collapse all
unified
split
pkgs
desktops
plasma-5.3
default.nix
+6
-2
pkgs/desktops/plasma-5.3/default.nix
···
12
12
# make a copy of this directory first. After copying, be sure to delete ./tmp
13
13
# if it exists. Then follow the minor update instructions.
14
14
15
15
-
{ pkgs, newScope, kf5 ? null, qt5 ? null, debug ? false }:
15
15
+
{ pkgs, newScope, kdeApps ? null, kf5 ? null, qt5 ? null, debug ? false }:
16
16
17
17
let inherit (pkgs) autonix stdenv symlinkJoin; in
18
18
19
19
with autonix; let inherit (stdenv) lib; in
20
20
21
21
let
22
22
+
kdeApps_ = if kdeApps != null then kdeApps else pkgs.kdeApps_15_04;
22
23
kf5_ = if kf5 != null then kf5 else pkgs.kf510;
23
24
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
24
25
in
25
26
26
27
let
27
28
28
28
-
qt5 = qt5_;
29
29
+
kdeApps = kdeApps_.override { inherit debug kf5 qt5; plasma5 = self; };
29
30
kf5 = kf5_.override { inherit debug qt5; };
31
31
+
qt5 = qt5_;
30
32
31
33
kdePackage = name: pkg:
32
34
let defaultOverride = drv: drv // {
···
113
115
mobilebroadbandproviderinfo = mobile_broadband_provider_info;
114
116
mtp = libmtp;
115
117
pulseaudio = libpulseaudio;
118
118
+
qalculate = libqalculate;
116
119
shareddesktopontologies = shared_desktop_ontologies;
117
120
sharedmimeinfo = shared_mime_info;
118
121
usb = libusb;
···
213
216
inherit (scope) kconfig kinit kservice qt5tools;
214
217
inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
215
218
dbus_tools = scope.dbus.tools;
219
219
+
kde_workspace = kdeApps.kde-workspace;
216
220
postPatch = ''
217
221
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
218
222
--replace kdostartupconfig5 $out/bin/kdostartupconfig5