diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix index ce8f841726e..eae386030d3 100644 --- a/pkgs/desktops/kde-4.5/bindings/default.nix +++ b/pkgs/desktops/kde-4.5/bindings/default.nix @@ -1,42 +1,37 @@ -{ stdenv, fetchurl, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost +{ kdePackage, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost , kdelibs, kdepimlibs, automoc4, soprano, akonadi, attica, polkit_qt_1, ruby }: # This function will only build the pykde4 module. I don't need the other bindings and # some bindings are even broken. -stdenv.mkDerivation rec { - name = "kdebindings-4.4.95"; - - src = fetchurl { - url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2"; - sha256 = "115xl1jcpnyr71573if0nvb3hy8z5hxqy5qlvc71pdprzrp78xbc"; - }; +kdePackage rec { + pn = "kdebindings"; + v = "4.5.0"; + sha256 = "0x8c98gbp2rm3dckzw3l0jh2ch5g9sb2prmilwzl8d5psyhx39n6"; patches = [ ./python-site-packages-install-dir.diff ]; preConfigure = '' CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@") CUSTOM_RUBY_SITE_LIB_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitelibdir']" | sed -e "s@${ruby}@$out@") - CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@") + CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@") cmakeFlagsArray=( - -DSIP_DEFAULT_SIP_DIR=$out/share/sip + -DSIP_DEFAULT_SIP_DIR=$out/share/sip -DCUSTOM_RUBY_SITE_ARCH_DIR=$CUSTOM_RUBY_SITE_ARCH_DIR - -DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR - -DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR - ) + -DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR + -DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR + ) ''; # Okular seems also an optional depenedency which I left out 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 akonadi attica polkit_qt_1 ruby ]; meta = { description = "KDE bindings"; longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python"; license = "LGPL"; - homepage = http://www.kde.org; - inherit (kdelibs.meta) maintainers; }; } diff --git a/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff b/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff index d1a58201b5f..7fe64e7eff5 100644 --- a/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff +++ b/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff @@ -39,7 +39,7 @@ diff --git a/python/pykde4/tools/pykdeuic4/CMakeLists.txt b/python/pykde4/tools/ index ea711ba..115c777 100644 --- a/python/pykde4/tools/pykdeuic4/CMakeLists.txt +++ b/python/pykde4/tools/pykdeuic4/CMakeLists.txt -@@ -1,5 +1,5 @@ +@@ -1,5 +1,9 @@ -PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/) -PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/) @@ -47,4 +47,8 @@ index ea711ba..115c777 100644 +PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/) find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH}) -INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) ++IF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR}) ++ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) ++ELSE(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR}) ++ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) ++ENDIF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})