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

* Revert r31596 (which changes the Qt for KDE 4.7). This doesn't

Browse Source 
belong in the stdenv branch and breaks KDE
  (http://hydra.nixos.org/build/2068311).

svn path=/nixpkgs/branches/stdenv-updates/; revision=32381
This commit is contained in:
Eelco Dolstra 2012-02-18 01:30:22 +00:00
parent a0bc441980
commit ce544df561
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/kde-4.7/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, callPackageOrig, stdenv, qt48 }: { callPackage, callPackageOrig, stdenv, qt47 }:
let let
release = "4.7.4"; release = "4.7.4";
@ -44,7 +44,7 @@ kde.modules // kde.individual //
akonadi = callPackage ./support/akonadi { }; akonadi = callPackage ./support/akonadi { };
qt4 = qt48; qt4 = qt47;
kdebase_workspace = kde.modules.kde_workspace; kdebase_workspace = kde.modules.kde_workspace;

8
pkgs/desktops/kde-4.7/kde-workspace.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies
lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, , lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate
consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, , consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
pykde4 , pykde4
}: }:
kde { kde {