forked from mirrors/nixpkgs
* Build kdm.
svn path=/nixpkgs/branches/kde-4.7/; revision=27772
This commit is contained in:
parent
e061898b74
commit
298c78ef40
|
@ -29,6 +29,7 @@ recurseIntoAttrs rec {
|
|||
kde = callPackage ./kde-package { inherit release; stable = false; };
|
||||
|
||||
### SUPPORT
|
||||
|
||||
akonadi = callPackage ./support/akonadi { };
|
||||
|
||||
oxygen_icons = callPackage ./support/oxygen-icons { };
|
||||
|
@ -42,16 +43,12 @@ recurseIntoAttrs rec {
|
|||
#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 { };
|
||||
|
||||
|
|
|
@ -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 @@ kde.package {
|
|||
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";
|
||||
|
|
Loading…
Reference in a new issue