Author: urkud
Date: Wed Aug 18 23:04:21 2010
New Revision: 23241
URL: https://svn.nixos.org/websvn/nix/?rev=23241&sc=1
Log:
Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Wed Aug 18 22:53:42
2010 (r23240)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Wed Aug 18 23:04:21
2010 (r23241)
@@ -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 { };
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 18 22:53:42
2010 (r23240)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 18 23:04:21
2010 (r23241)
@@ -6610,12 +6610,11 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
