ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 05:37:40 +03:00
Code Issues Projects Releases Wiki Activity

plasma53.plasma-workspace: fix path to kapplymousetheme

Browse Source
This commit is contained in:
Thomas Tuegel 2015-06-19 15:36:07 -05:00
parent 9899ce476d
commit 2faa29d129
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/plasma-5.3/default.nix
View File

@ -12,21 +12,23 @@
# make a copy of this directory first. After copying, be sure to delete ./tmp # make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions. # if it exists. Then follow the minor update instructions.
{ pkgs, newScope, kf5 ? null, qt5 ? null, debug ? false }: { pkgs, newScope, kdeApps ? null, kf5 ? null, qt5 ? null, debug ? false }:
let inherit (pkgs) autonix stdenv symlinkJoin; in let inherit (pkgs) autonix stdenv symlinkJoin; in
with autonix; let inherit (stdenv) lib; in with autonix; let inherit (stdenv) lib; in
let let
kdeApps_ = if kdeApps != null then kdeApps else pkgs.kdeApps_15_04;
kf5_ = if kf5 != null then kf5 else pkgs.kf510; kf5_ = if kf5 != null then kf5 else pkgs.kf510;
qt5_ = if qt5 != null then qt5 else pkgs.qt54; qt5_ = if qt5 != null then qt5 else pkgs.qt54;
in in
let let
qt5 = qt5_; kdeApps = kdeApps_.override { inherit debug kf5 qt5; plasma5 = self; };
kf5 = kf5_.override { inherit debug qt5; }; kf5 = kf5_.override { inherit debug qt5; };
qt5 = qt5_;
kdePackage = name: pkg: kdePackage = name: pkg:
let defaultOverride = drv: drv // { let defaultOverride = drv: drv // {
@ -113,6 +115,7 @@ let
mobilebroadbandproviderinfo = mobile_broadband_provider_info; mobilebroadbandproviderinfo = mobile_broadband_provider_info;
mtp = libmtp; mtp = libmtp;
pulseaudio = libpulseaudio; pulseaudio = libpulseaudio;
qalculate = libqalculate;
shareddesktopontologies = shared_desktop_ontologies; shareddesktopontologies = shared_desktop_ontologies;
sharedmimeinfo = shared_mime_info; sharedmimeinfo = shared_mime_info;
usb = libusb; usb = libusb;
@ -213,6 +216,7 @@ let
inherit (scope) kconfig kinit kservice qt5tools; inherit (scope) kconfig kinit kservice qt5tools;
inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot; inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
dbus_tools = scope.dbus.tools; dbus_tools = scope.dbus.tools;
kde_workspace = kdeApps.kde-workspace;
postPatch = '' postPatch = ''
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
--replace kdostartupconfig5 $out/bin/kdostartupconfig5 --replace kdostartupconfig5 $out/bin/kdostartupconfig5