Author: eelco Date: Sat Feb 18 01:30:22 2012 New Revision: 32381 URL: https://nixos.org/websvn/nix/?rev=32381&sc=1
Log: * Revert r31596 (which changes the Qt for KDE 4.7). This doesn't belong in the stdenv branch and breaks KDE (http://hydra.nixos.org/build/2068311). Modified: nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/default.nix nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/kde-workspace.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/default.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/default.nix Sat Feb 18 00:18:26 2012 (r32380) +++ nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/default.nix Sat Feb 18 01:30:22 2012 (r32381) @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48 }: +{ callPackage, callPackageOrig, stdenv, qt47 }: let release = "4.7.4"; @@ -44,7 +44,7 @@ akonadi = callPackage ./support/akonadi { }; - qt4 = qt48; + qt4 = qt47; kdebase_workspace = kde.modules.kde_workspace; Modified: nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/kde-workspace.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/kde-workspace.nix Sat Feb 18 00:18:26 2012 (r32380) +++ nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/kde-workspace.nix Sat Feb 18 01:30:22 2012 (r32381) @@ -1,7 +1,7 @@ -{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, - lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, - consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, - pykde4 +{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies +, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate +, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi +, pykde4 }: kde { _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
