Added kdeadmin-4.2 package and kdepimlibs support
svn path=/nixpkgs/trunk/; revision=14130
This commit is contained in:
parent
c8e6fa7dd6
commit
d3e990cf90
3 changed files with 9 additions and 7 deletions
|
@ -6,5 +6,6 @@ stdenv.mkDerivation {
|
|||
url = mirror://kde/stable/4.2.0/src/kdeadmin-4.2.0.tar.bz2;
|
||||
md5 = "2c5b33477b5679bcd9fdbc1f8017e6fb";
|
||||
};
|
||||
CMAKE_PREFIX_PATH=kdepimlibs;
|
||||
buildInputs = [ cmake qt4 pkgconfig perl kdelibs kdepimlibs automoc4 phonon ];
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{stdenv, fetchurl, cmake, perl, python,
|
||||
qt4, kdelibs,
|
||||
libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage,
|
||||
lm_sensors, libxklavier, libusb, pthread_stubs,
|
||||
automoc4, phonon, strigi, soprano, qimageblitz}:
|
||||
qt4, kdelibs, kdepimlibs,
|
||||
libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage,
|
||||
lm_sensors, libxklavier, libusb, pthread_stubs, boost,
|
||||
automoc4, phonon, strigi, soprano, qimageblitz}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdebase-workspace-4.2.0";
|
||||
|
@ -10,7 +10,8 @@ stdenv.mkDerivation {
|
|||
url = mirror://kde/stable/4.2.0/src/kdebase-workspace-4.2.0.tar.bz2;
|
||||
md5 = "193e30b9ed0b55b0196289d9df43a904";
|
||||
};
|
||||
buildInputs = [ cmake perl python qt4 kdelibs pthread_stubs libusb stdenv.gcc.libc
|
||||
CMAKE_PREFIX_PATH=kdepimlibs;
|
||||
buildInputs = [ cmake perl python qt4 kdelibs kdepimlibs pthread_stubs boost libusb stdenv.gcc.libc
|
||||
libXi libXau libXdmcp libXtst libXcomposite libXdamage
|
||||
lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ];
|
||||
}
|
||||
|
|
|
@ -47,9 +47,9 @@ rec {
|
|||
### BASE
|
||||
kdebase_workspace = import ./base-workspace {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl python;
|
||||
inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs;
|
||||
inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost;
|
||||
inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage;
|
||||
inherit kdelibs;
|
||||
inherit kdelibs kdepimlibs;
|
||||
inherit automoc4 phonon strigi soprano qimageblitz;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue