[Nix-commits] SVN commit: nix - r27772 - nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7

[Eelco Dolstra]

Author: eelco
Date: Thu Jul 14 08:42:01 2011
New Revision: 27772
URL: https://svn.nixos.org/websvn/nix/?rev=27772&sc=1

Log:
* Build kdm.

Modified:
   nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
   nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix

Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix  Wed Jul 13 
20:58:48 2011        (r27771)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix  Thu Jul 14 
08:42:01 2011        (r27772)
@@ -29,6 +29,7 @@
   kde = callPackage ./kde-package { inherit release; stable = false; };
 
 ### SUPPORT
+
   akonadi = callPackage ./support/akonadi { };
 
   oxygen_icons = callPackage ./support/oxygen-icons { };
@@ -42,16 +43,12 @@
   #kipi_plugins = callPackage ./kipi-plugins { };
 
 ### LIBS
+
   kdelibs = callPackage ./libs { };
 
   kdepimlibs = callPackage ./pimlibs { };
 
 ### BASE
-  kdebase = callPackage ./base { };
-
-  kdebase_workspace = callPackage ./base-workspace { };
-
-  kdebase_runtime = callPackage ./base-runtime { };
 
   kde_baseapps = callPackage ./baseapps.nix { };
 

Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix        Wed Jul 
13 20:58:48 2011        (r27771)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix        Thu Jul 
14 08:42:01 2011        (r27772)
@@ -1,6 +1,6 @@
 { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
-, libusb, libxklavier, perl, python, libqalculate, akonadi
+, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
 }:
 
 kde.package {
@@ -8,13 +8,15 @@
   buildInputs =
     [ cmake kdelibs qt4 automoc4 strigi qimageblitz libdbusmenu_qt
       xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
-      xorg.libXcomposite xorg.libXdamage xorg.libXau
+      xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
+      xorg.libpthreadstubs
       soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
-      libusb python libqalculate akonadi
+      libusb python libqalculate akonadi perl consolekit
     ];
 
-  # Workaround for ‘undefined reference to `dlsym'’ in kwinglutils_funcs.cpp.
-  NIX_LDFLAGS = "-ldl";
+  # Workaround for undefined reference to ‘dlsym’ in
+  # kwinglutils_funcs.cpp and ‘clock_gettime’ in kdm/backend/dm.c.
+  NIX_LDFLAGS = "-ldl -lrt";
 
   meta = {
     description = "KDE workspace components such as Plasma, Kwin and System 
Settings";
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits