forked from mirrors/nixpkgs
KDE4.10: Fix PyKDE4 build I accidentally left in a broken state. Remove notice from kajongg because it
compiles fine now.
This commit is contained in:
parent
a08fba4fce
commit
a1924fca12
|
@ -1,19 +1,21 @@
|
|||
{ 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
|
||||
|
||||
kde {
|
||||
#todo: doesn't build
|
||||
buildInputs = [ python kdepimlibs
|
||||
# shared_desktop_ontologies boost
|
||||
];
|
||||
|
||||
# todo: polkit isn't found by the build system
|
||||
|
||||
buildInputs = [
|
||||
python kdepimlibs shared_desktop_ontologies
|
||||
boost nepomuk_core polkit_qt_1 pkgconfig
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pyqt4 sip ];
|
||||
|
||||
# patches = [ ./pykde4-hardcode-lib-python.patch ];
|
||||
|
||||
cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
|
||||
# cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }:
|
||||
kde rec {
|
||||
#todo: doesn't build
|
||||
|
||||
buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
|
||||
|
||||
pythonPath = [ pythonPackages.twisted pykde4 ];
|
||||
|
|
Loading…
Reference in a new issue