diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-10-27 19:39:58 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-10-31 08:48:52 -0500 |
| commit | beaca8e3b7846d0f278101f05603847c12ca926d (patch) | |
| tree | 96b2a760128855db67df7b09cbef40aa30ef44e2 /pkgs/desktops | |
| parent | 0054a127726b54349ef6882abf286d73eec6e78f (diff) | |
| download | nixlib-beaca8e3b7846d0f278101f05603847c12ca926d.tar nixlib-beaca8e3b7846d0f278101f05603847c12ca926d.tar.gz nixlib-beaca8e3b7846d0f278101f05603847c12ca926d.tar.bz2 nixlib-beaca8e3b7846d0f278101f05603847c12ca926d.tar.lz nixlib-beaca8e3b7846d0f278101f05603847c12ca926d.tar.xz nixlib-beaca8e3b7846d0f278101f05603847c12ca926d.tar.zst nixlib-beaca8e3b7846d0f278101f05603847c12ca926d.zip | |
plasma-workspace: kapplymousetheme moved to plasma-desktop
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch | 17 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch | 4 |
2 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch index 9f2de9c7f9a0..f66cb6189270 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch @@ -1,14 +1,14 @@ -From 3d837f48853987d5adaf69a9498c4cf116368a18 Mon Sep 17 00:00:00 2001 +From 35efc2ce92ed698abb21a79aa6e6670e844ea776 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Thu, 27 Aug 2015 20:36:39 -0500 Subject: [PATCH 1/2] startkde NixOS patches --- - startkde/startkde.cmake | 219 ++++++++++++++++++++---------------------------- - 1 file changed, 89 insertions(+), 130 deletions(-) + startkde/startkde.cmake | 217 ++++++++++++++++++++---------------------------- + 1 file changed, 88 insertions(+), 129 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 2c4c315..d418253 100644 +index 2c4c315..7733721 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,8 +1,31 @@ @@ -94,7 +94,7 @@ index 2c4c315..d418253 100644 #This is basically setting defaults so we can use them with kstartupconfig5 cat >$configDir/startupconfigkeys <<EOF -@@ -101,55 +106,21 @@ XftSubPixel=none +@@ -101,53 +106,19 @@ XftSubPixel=none EOF } @@ -150,11 +150,8 @@ index 2c4c315..d418253 100644 if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then - @EXPORT_XCURSOR_PATH@ -- kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" -+ @out@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" + kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" if test $? -eq 10; then - XCURSOR_THEME=breeze_cursors - export XCURSOR_THEME @@ -163,21 +134,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" fi fi @@ -400,5 +397,5 @@ index 2c4c315..d418253 100644 echo 'startkde: Done.' 1>&2 -- -2.5.2 +2.6.2 diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch index 8eec571654ed..7614a2add9d7 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch @@ -1,4 +1,4 @@ -From 709fe8bff26c9680de13be5e8e5bc587c25a9b2e Mon Sep 17 00:00:00 2001 +From 033d3560d26ceabbd6da6310d326fec7a473df82 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Mon, 19 Oct 2015 18:55:36 -0500 Subject: [PATCH 2/2] qt-5.5 QML import paths @@ -119,5 +119,5 @@ index 2e26455..864c9c5 100644 Item { id: root -- -2.5.2 +2.6.2 |