ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

KDE4.10: Fix PyKDE4 build I accidentally left in a broken state. Remove notice from kajongg because it

Browse Source 
compiles fine now.
This commit is contained in:
Evgeny Egorochkin 2013-05-06 17:26:51 +03:00
parent a08fba4fce
commit a1924fca12
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/desktops/kde-4.10/kdebindings/pykde4.nix
View File

@ -1,19 +1,21 @@
{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, { kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
boost, lndir }: nepomuk_core, polkit_qt_1, boost, lndir, pkgconfig }:
let pydir = "lib/python${python.majorVersion}"; in let pydir = "lib/python${python.majorVersion}"; in
kde { kde {
#todo: doesn't build
buildInputs = [ python kdepimlibs # todo: polkit isn't found by the build system
# shared_desktop_ontologies boost
]; buildInputs = [
python kdepimlibs shared_desktop_ontologies
boost nepomuk_core polkit_qt_1 pkgconfig
];
propagatedBuildInputs = [ pyqt4 sip ]; propagatedBuildInputs = [ pyqt4 sip ];
# patches = [ ./pykde4-hardcode-lib-python.patch ]; # patches = [ ./pykde4-hardcode-lib-python.patch ];
# cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
preConfigure = preConfigure =
'' ''

2
pkgs/desktops/kde-4.10/kdegames/kajongg.nix
View File

@ -1,6 +1,6 @@
{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }: { kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }:
kde rec { kde rec {
#todo: doesn't build
buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath; buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
pythonPath = [ pythonPackages.twisted pykde4 ]; pythonPath = [ pythonPackages.twisted pykde4 ];