diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix index b7bb4573a944..959a0eddd666 100644 --- a/pkgs/desktops/kde-4.5/libs/default.nix +++ b/pkgs/desktops/kde-4.5/libs/default.nix @@ -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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d71653058700..7b6b89fb0776 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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); };