Author: eelco
Date: Sun Jul 31 19:12:10 2011
New Revision: 28022
URL: https://svn.nixos.org/websvn/nix/?rev=28022&sc=1
Log:
* Disable kdebindings in the old KDE 4.5. It doesn't build anymore
due to changes in Phonon and other packages. It's not really
important anyway.
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/bindings/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/games/default.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/bindings/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/bindings/default.nix Sun Jul
31 15:33:55 2011 (r28021)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/bindings/default.nix Sun Jul
31 19:12:10 2011 (r28022)
@@ -19,10 +19,10 @@
-DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR
)
'';
-
+
# TODO: okular, qimageblitz, qwt5, qscintilla2, c#
buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig
qt4 boost
- kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1 ruby
];
+ kdelibs kdepimlibs automoc4 soprano attica polkit_qt_1 ruby ];
meta = {
description = "KDE bindings";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/default.nix Sun Jul 31
15:33:55 2011 (r28021)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/default.nix Sun Jul 31
19:12:10 2011 (r28022)
@@ -123,7 +123,7 @@
ktimer = callPackage ./utils/ktimer.nix { };
kwallet = callPackage ./utils/kwallet.nix { };
okteta = callPackage ./utils/okteta.nix { };
- printer_applet = callPackage ./utils/printer-applet.nix { };
+ #printer_applet = callPackage ./utils/printer-applet.nix { };
superkaramba = callPackage ./utils/superkaramba.nix { };
sweeper = callPackage ./utils/sweeper.nix { };
};
@@ -140,7 +140,8 @@
### DEVELOPMENT
- kdebindings = callPackage ./bindings { };
+ #kdebindings = callPackage ./bindings { };
+ kdebindings = null;
l10n = callPackage ./l10n { inherit release; };
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/games/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/games/default.nix Sun Jul
31 15:33:55 2011 (r28021)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/games/default.nix Sun Jul
31 19:12:10 2011 (r28022)
@@ -7,10 +7,6 @@
buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
kdebindings twisted python pyqt4 sip makeWrapper ];
- postInstall = ''
- wrapProgram $out/bin/kajongg --set PYTHONPATH $PYTHONPATH
- wrapProgram $out/bin/kajonggserver --set PYTHONPATH $PYTHONPATH'';
-
meta = {
description = "KDE Games";
license = "GPL";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
