mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 21:18:28 +03:00
Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work
svn path=/nixpkgs/trunk/; revision=23241
This commit is contained in:
parent
9c1a9c2c4b
commit
2957f9cc11
@ -1,8 +1,12 @@
|
|||||||
{ callPackage, stdenv, fetchurl } :
|
{ callPackage, stdenv, fetchurl, qt47 } :
|
||||||
|
|
||||||
{
|
{
|
||||||
recurseForRelease = true;
|
recurseForRelease = true;
|
||||||
|
|
||||||
|
qt4 = qt47;
|
||||||
|
|
||||||
|
phonon = null;
|
||||||
|
|
||||||
kdePackage = import ./kde-package {
|
kdePackage = import ./kde-package {
|
||||||
inherit stdenv fetchurl;
|
inherit stdenv fetchurl;
|
||||||
};
|
};
|
||||||
@ -56,6 +60,9 @@
|
|||||||
kdetoys = callPackage ./toys { };
|
kdetoys = callPackage ./toys { };
|
||||||
kdeutils = callPackage ./utils { };
|
kdeutils = callPackage ./utils { };
|
||||||
kdewebdev = callPackage ./webdev { };
|
kdewebdev = callPackage ./webdev { };
|
||||||
|
|
||||||
|
kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
|
||||||
|
kdepim = callPackage ../kde-4.4/pim { };
|
||||||
### DEVELOPMENT
|
### DEVELOPMENT
|
||||||
|
|
||||||
kdebindings = callPackage ./bindings { };
|
kdebindings = callPackage ./bindings { };
|
||||||
|
@ -6610,12 +6610,11 @@ let
|
|||||||
|
|
||||||
kde45 = callPackage ../desktops/kde-4.5 {
|
kde45 = callPackage ../desktops/kde-4.5 {
|
||||||
callPackage = newScope ({
|
callPackage = newScope ({
|
||||||
qt4 = qt47;
|
|
||||||
pyqt4 = pyqt4.override { qt4 = qt47; };
|
pyqt4 = pyqt4.override { qt4 = qt47; };
|
||||||
libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
|
libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
|
||||||
shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
|
shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
|
||||||
stdenv = stdenv2;
|
stdenv = stdenv2;
|
||||||
} // kde45);
|
} // pkgs.kde45);
|
||||||
};
|
};
|
||||||
|
|
||||||
xfce = xfce4;
|
xfce = xfce4;
|
||||||
|
Loading…
Reference in New Issue
Block a user