mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Use pkgs. in override, override qjson in kde-4.5

Browse source 
svn path=/nixpkgs/trunk/; revision=23287
This commit is contained in:
Yury G. Kudryashov 2010-08-20 20:13:01 +00:00
parent 10c5146a78
commit 3beeb6611a
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/desktops/kde-4.5/libs/default.nix
View file

@ -21,6 +21,7 @@ kdePackage {
patches = [ ./polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment
# TODO: OpenEXR, hspell
cmakeFlags = [
"-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON"
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"

13
pkgs/top-level/all-packages.nix
View file

@ -6597,16 +6597,17 @@ let
kde4 = kde44;
kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
qt4 = qt46;
stdenv = stdenv2;
qt4 = pkgs.qt46;
stdenv = pkgs.stdenv2;
});
kde45 = callPackage ../desktops/kde-4.5 {
callPackage = newScope ({
pyqt4 = pyqt4.override { qt4 = qt47; };
libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
stdenv = stdenv2;
qjson = pkgs.qjson.override { qt4 = qt47; };
pyqt4 = pkgs.pyqt4.override { qt4 = qt47; };
libdbusmenu_qt = pkgs.libdbusmenu_qt.override { qt4 = qt47; };
shared_desktop_ontologies = pkgs.shared_desktop_ontologies.override { v = "0.5"; };
stdenv = pkgs.stdenv2;
} // pkgs.kde45);
};