about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBastian Köcher <git@kchr.de>2017-09-14 13:01:43 +0200
committerBastian Köcher <git@kchr.de>2017-09-14 13:01:43 +0200
commit4bfb9e3c9bbe6de97d9f8b7f9fa7effa8f85e5a3 (patch)
tree7d48d4355f3bb26fe38ae6c8cdf3b2ccdc688304 /pkgs/desktops
parentc01e064750275614518cc3c04997702c214b8821 (diff)
downloadnixlib-4bfb9e3c9bbe6de97d9f8b7f9fa7effa8f85e5a3.tar
nixlib-4bfb9e3c9bbe6de97d9f8b7f9fa7effa8f85e5a3.tar.gz
nixlib-4bfb9e3c9bbe6de97d9f8b7f9fa7effa8f85e5a3.tar.bz2
nixlib-4bfb9e3c9bbe6de97d9f8b7f9fa7effa8f85e5a3.tar.lz
nixlib-4bfb9e3c9bbe6de97d9f8b7f9fa7effa8f85e5a3.tar.xz
nixlib-4bfb9e3c9bbe6de97d9f8b7f9fa7effa8f85e5a3.tar.zst
nixlib-4bfb9e3c9bbe6de97d9f8b7f9fa7effa8f85e5a3.zip
kde4Workspace: Remove, because it is not maintained anymore
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/kde-4.14/kde-package/4.14.3.nix3
-rw-r--r--pkgs/desktops/kde-4.14/kde-workspace.nix41
2 files changed, 0 insertions, 44 deletions
diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
index 401069785763..5d9e2401ca82 100644
--- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
@@ -3,7 +3,6 @@ hashes=builtins.listToAttrs[
   {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";}
   {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";}
   {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";}
-  {name="kde-workspace";value="00bf708i0vzl47dgcr8mp61n7k0xjzqnlb8j1smliy5bydiaa86g";}
   {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";}
   {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";}
   {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";}
@@ -18,7 +17,6 @@ versions=builtins.listToAttrs[
   {name="kde-baseapps";value="4.14.3";}
   {name="kdepimlibs";value="4.14.3";}
   {name="kde-runtime";value="4.14.3";}
-  {name="kde-workspace";value="4.11.14";}
   {name="kfilemetadata";value="4.14.3";}
   {name="libkcddb";value="4.14.3";}
   {name="libkdcraw";value="4.14.3";}
@@ -69,6 +67,5 @@ sane="kde_baseapps";  split=true;
 }
 { module="kactivities";  split=false;}
 { module="kdepimlibs";  split=false;}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
 ];
 }
diff --git a/pkgs/desktops/kde-4.14/kde-workspace.nix b/pkgs/desktops/kde-4.14/kde-workspace.nix
deleted file mode 100644
index 5aeba4be3a6e..000000000000
--- a/pkgs/desktops/kde-4.14/kde-workspace.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
-, pciutils, libraw1394, libusb1, python, libqalculate, akonadi
-, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
-, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
-}:
-
-kde {
-#todo: wayland, xmms,   libusb isn't found
-#note: xorg.libXft is needed to build kfontview and kfontinst though this isn't reflected in the build log
-  buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg
-      xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
-      xorg.libxkbfile xorg.libXcomposite  xorg.libXtst
-      xorg.libXdamage xorg.libXft
-
-      python boost qjson lm_sensors /* gpsd */ libraw1394 pciutils udev
-      akonadi pam libusb1 libqalculate kdepimlibs  prison
-      kactivities
-    ];
-
-  patches = [ ./files/ksysguard-0001-disable-signalplottertest.patch ];
-
-  preConfigure =
-   ''
-     # Fix incorrect path to kde4-config.
-     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
-
-     # Fix the path to the keyboard configuration files.
-     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
-       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
-   '';
-
-  NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # gcc-6
-
-  enableParallelBuilding = false; # frequent problems on Hydra
-
-  meta = {
-    description = "KDE workspace components such as Plasma, Kwin and System Settings";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}