Author: urkud
Date: Fri Aug 20 20:13:01 2010
New Revision: 23287
URL: https://svn.nixos.org/websvn/nix/?rev=23287&sc=1
Log:
Use pkgs. in override, override qjson in kde-4.5
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix Fri Aug 20
20:12:03 2010 (r23286)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix Fri Aug 20
20:13:01 2010 (r23287)
@@ -21,6 +21,7 @@
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"
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 20 20:12:03
2010 (r23286)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 20 20:13:01
2010 (r23287)
@@ -6597,16 +6597,17 @@
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);
};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
