From 2957f9cc112864f49745b608afa1b24f8fc36a88 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 18 Aug 2010 23:04:21 +0000 Subject: [PATCH] Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work svn path=/nixpkgs/trunk/; revision=23241 --- pkgs/desktops/kde-4.5/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 8d9ea757a68..7bb4ada0073 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -1,8 +1,12 @@ -{ callPackage, stdenv, fetchurl } : +{ callPackage, stdenv, fetchurl, qt47 } : { recurseForRelease = true; + qt4 = qt47; + + phonon = null; + kdePackage = import ./kde-package { inherit stdenv fetchurl; }; @@ -56,6 +60,9 @@ kdetoys = callPackage ./toys { }; kdeutils = callPackage ./utils { }; kdewebdev = callPackage ./webdev { }; + + kdepim_runtime = callPackage ../kde-4.4/pim-runtime { }; + kdepim = callPackage ../kde-4.4/pim { }; ### DEVELOPMENT kdebindings = callPackage ./bindings { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e1fc4a54ce..0014420bf45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6610,12 +6610,11 @@ let kde45 = callPackage ../desktops/kde-4.5 { callPackage = newScope ({ - qt4 = qt47; pyqt4 = pyqt4.override { qt4 = qt47; }; libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; }; shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; }; stdenv = stdenv2; - } // kde45); + } // pkgs.kde45); }; xfce = xfce4;