* Bring back libXxf86misc and xf86miscproto. These were removed from

  X.org, but some packages still need them.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18038

3 files changed, 8 insertions, 8 deletions

diff --git a/pkgs/desktops/kde-4.3/base-workspace/default.nix b/pkgs/desktops/kde-4.3/base-workspace/default.nix
index 48b4be450b33..437521097650 100644
--- a/pkgs/desktops/kde-4.3/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.3/base-workspace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib, cmake, perl, python, pam, ConsoleKit
 , qt4, sip, pyqt4, kdelibs, kdelibs_experimental, kdepimlibs, kdebindings
 , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
-, lm_sensors, libxklavier, libusb, pthread_stubs, boost
+, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
 , automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   CMAKE_PREFIX_PATH=kdepimlibs;
   inherit kdelibs_experimental;
   builder = ./builder.sh;
-  buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc
+  buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ libpthreadstubs boost libusb stdenv.gcc.libc
                   libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
                   lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ];
   meta = {
diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix
index 4dfcd8c924e1..e622a4fb46c4 100644
--- a/pkgs/desktops/kde-4.3/default.nix
+++ b/pkgs/desktops/kde-4.3/default.nix
@@ -11,8 +11,8 @@ pkgs.recurseIntoAttrs (rec {
 
   phonon = import ./support/phonon {
     inherit (pkgs) stdenv fetchurl lib cmake;
-    inherit (pkgs) qt4 pthread_stubs gst_all xineLib;
-    inherit (pkgs.xlibs) libXau libXdmcp;
+    inherit (pkgs) qt4 gst_all xineLib;
+    inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
     inherit automoc4;
   };
 
@@ -68,8 +68,8 @@ pkgs.recurseIntoAttrs (rec {
 ### BASE  
   kdebase_workspace = import ./base-workspace {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4;
-    inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost ConsoleKit;
-    inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver;
+    inherit (pkgs) lm_sensors libxklavier libusb boost ConsoleKit;
+    inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs;
     inherit kdelibs kdelibs_experimental kdepimlibs kdebindings;
     inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;
   };
diff --git a/pkgs/desktops/kde-4.3/support/phonon/default.nix b/pkgs/desktops/kde-4.3/support/phonon/default.nix
index 667e64287f5d..2e538107009b 100644
--- a/pkgs/desktops/kde-4.3/support/phonon/default.nix
+++ b/pkgs/desktops/kde-4.3/support/phonon/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, cmake, qt4
-, libXau, libXdmcp, pthread_stubs
+, libXau, libXdmcp, libpthreadstubs
 , gst_all, xineLib, automoc4}:
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c";
   };
   includeAllQtDirs = true;
-  buildInputs = [ cmake qt4 libXau libXdmcp pthread_stubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ];
+  buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ];
   meta = {
     description = "KDE Multimedia API";
     longDescription = "KDE Multimedia API which abstracts over various backends such as GStreamer and Xine";