public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde4.workspace updated

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10202
This commit is contained in:
Yury G. Kudryashov 2008-01-17 13:04:21 +00:00
parent 4bfa9fdc40
commit a2705398ff
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/kde-4/workspace/builder.sh
View File

@ -1,9 +0,0 @@
source ${stdenv}/setup
myPatchPhase()
{
fixCmakeDbusCalls
sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../kcontrol/randr/randr.h
}
patchPhase=myPatchPhase
genericBuild

6
pkgs/desktops/kde-4/workspace/default.nix
View File

@ -2,12 +2,14 @@ args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdebase-workspace-4.0.0"; name = "kdebase-workspace-4.0.0";
builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://kde/stable/4.0/src/kdebase-workspace-4.0.0.tar.bz2; url = mirror://kde/stable/4.0/src/kdebase-workspace-4.0.0.tar.bz2;
sha256 = "08sgp7jaqljdxwsgr5lyyfd6w734yv24zswps1mchmhj01vz1fcg"; sha256 = "08sgp7jaqljdxwsgr5lyyfd6w734yv24zswps1mchmhj01vz1fcg";
}; };
buildInputs = [kdelibs kdepimlibs stdenv.gcc.libc]; propagatedBuildInputs = [kdelibs kdepimlibs stdenv.gcc.libc libusb
libpthreadstubs];
buildInputs = [cmake];
patchPhase = "fixCmakeDbusCalls";
} }

2
pkgs/top-level/all-packages.nix
View File

@ -4730,7 +4730,7 @@ rec {
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
libxkbfile libXinerama; libxkbfile libXinerama libpthreadstubs;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
qt = qt4; qt = qt4;
dbus = dbus_alts.withX11; dbus = dbus_alts.withX11;