ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work

Browse Source 
svn path=/nixpkgs/trunk/; revision=23241
This commit is contained in:
Yury G. Kudryashov 2010-08-18 23:04:21 +00:00
parent 9c1a9c2c4b
commit 2957f9cc11
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/kde-4.5/default.nix
View File

@ -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 { };

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

@ -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;