Author: eelco
Date: Thu Jul 21 21:54:40 2011
New Revision: 27894
URL: https://svn.nixos.org/websvn/nix/?rev=27894&sc=1
Log:
* Update kdegames.
Added:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games.nix
- copied, changed from r27866,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pykde4.nix
Deleted:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games/
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/attica/default.nix
nixpkgs/branches/kde-4.7/pkgs/development/python-modules/pyqt/default.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Thu Jul 21
21:46:06 2011 (r27893)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Thu Jul 21
21:54:40 2011 (r27894)
@@ -61,6 +61,10 @@
# Backwards compatibility.
kdebase_workspace = kde_workspace;
+### BINDINGS
+
+ pykde4 = callPackage ./pykde4.nix { };
+
### OTHER MODULES
gwenview = callPackage ./gwenview.nix { };
@@ -79,6 +83,8 @@
kde_wallpapers = callPackage ./wallpapers.nix { };
+ kdegames = callPackage ./games.nix { };
+
/*
kdeaccessibility = combinePkgs "kdeaccessibility" {
colorSchemes = callPackage ./accessibility/color-schemes.nix { };
Copied and modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games.nix
(from r27866, nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games/default.nix)
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games/default.nix Thu Jul
21 07:42:05 2011 (r27866, copy source)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games.nix Thu Jul 21
21:54:40 2011 (r27894)
@@ -1,15 +1,22 @@
-{kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
-, kdebindings, twisted, python, pyqt4, sip, makeWrapper }:
+{ kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
+, twisted, pythonPackages, pyqt4, sip, makeWrapper, phonon, pykde4 }:
-kde.package {
+kde.package rec {
-# TODO: ggz
- buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
- kdebindings twisted python pyqt4 sip makeWrapper ];
+ buildInputs =
+ [ cmake kdelibs qt4 automoc4 phonon shared_mime_info qca2
+ pythonPackages.python pythonPackages.wrapPython
+ ] ++ pythonPath;
- postInstall = ''
- wrapProgram $out/bin/kajongg --set PYTHONPATH $PYTHONPATH
- wrapProgram $out/bin/kajonggserver --set PYTHONPATH $PYTHONPATH'';
+ pythonPath =
+ [ pythonPackages.twisted pyqt4 pykde4 ];
+
+ # TODO: ggz
+
+ postInstall =
+ ''
+ wrapPythonPrograms
+ '';
meta = {
description = "KDE Games";
Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pykde4.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pykde4.nix Thu Jul 21
21:54:40 2011 (r27894)
@@ -0,0 +1,23 @@
+{ kde, cmake, qt4, automoc4, kdelibs, phonon, python, sip, pyqt4
+, soprano, kdepimlibs, shared_desktop_ontologies, boost }:
+
+kde.package {
+
+ buildInputs =
+ [ cmake kdelibs qt4 automoc4 phonon python sip pyqt4 soprano
+ kdepimlibs shared_desktop_ontologies boost
+ ];
+
+ NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
+
+ preConfigure =
+ ''
+ substituteInPlace CMakeLists.txt \
+ --replace '{SIP_DEFAULT_SIP_DIR}' '{CMAKE_INSTALL_PREFIX}/share/sip'
+ '';
+
+ meta = {
+ description = "Python bindings for KDE";
+ kde.name = "pykde4";
+ };
+}
Modified: nixpkgs/branches/kde-4.7/pkgs/development/libraries/attica/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/attica/default.nix
Thu Jul 21 21:46:06 2011 (r27893)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/attica/default.nix
Thu Jul 21 21:54:40 2011 (r27894)
@@ -1,12 +1,15 @@
-{stdenv, fetchurl, cmake, qt4}:
+{ stdenv, fetchurl, cmake, qt4 }:
stdenv.mkDerivation rec {
name = "attica-0.2.0";
+
src = fetchurl {
url = "mirror://kde/stable/attica/${name}.tar.bz2";
sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a";
};
+
buildInputs = [ cmake qt4 ];
+
meta = with stdenv.lib; {
description = "A library to access Open Collaboration Service providers";
license = "LGPL";
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/python-modules/pyqt/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/python-modules/pyqt/default.nix
Thu Jul 21 21:46:06 2011 (r27893)
+++ nixpkgs/branches/kde-4.7/pkgs/development/python-modules/pyqt/default.nix
Thu Jul 21 21:54:40 2011 (r27894)
@@ -21,7 +21,9 @@
python configure.py $configureFlags "''${configureFlagsArray[@]}"
'';
- buildInputs = [ python pkgconfig makeWrapper sip qt4 pythonDBus ];
+ buildInputs = [ python pkgconfig makeWrapper qt4 ];
+
+ propagatedBuildInputs = [ sip pythonDBus ];
postInstall = ''
for i in $out/bin/*; do
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
