diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:11:01 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:08:12 -0500 |
| commit | 2e0589b4ca8f43dbce3e5af91c6e4375681ebee5 (patch) | |
| tree | e2b3b4f6ec45ed280d298363f3a40eb2a510f789 | |
| parent | dd264938bc1df93a66f7647d9ace267a241a3da7 (diff) | |
kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages' dependencies. On the Nixpkgs side, we no longer propagate the dependency on cmake (to reduce closure size), so downstream dependencies had to be adjusted for most packages that depend on kdelibs.
56 files changed, 385 insertions, 210 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 6ecdc1f98d441..d99e1b7a150f3 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl -, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs -, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon -, strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null }: +{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig +, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib +, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod +, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null +}: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -16,9 +17,13 @@ stdenv.mkDerivation rec { QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl - libxml2 mysql.lib taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi - soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + buildInputs = [ + qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.lib + taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2 + libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core + ]; cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index b428289b95d99..7f7b22dfa134c 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, kdelibs, cmake, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, shared_mime_info, kdelibs +}: stdenv.mkDerivation rec { name = "kile-2.1.3"; @@ -8,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0"; }; - nativeBuildInputs = [ cmake gettext ]; + nativeBuildInputs = [ + automoc4 cmake gettext perl pkgconfig shared_mime_info + ]; buildInputs = [ kdelibs ]; # for KDE 4.7 the nl translations fail since kile-2.1.2 diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix deleted file mode 100644 index e2ca03fe044eb..0000000000000 --- a/pkgs/applications/graphics/digikam/2.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, -liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, -shared_desktop_ontologies, marble, libmysql }: - -stdenv.mkDerivation rec { - name = "digikam-2.9.0"; - - src = fetchurl { - url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk"; - }; - - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - - buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff - jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw - opencv libkexiv2 libkipi boost shared_desktop_ontologies marble libmysql ]; - - # Make digikam find some FindXXXX.cmake - KDEDIRS="${marble}:${qjson}"; - - enableParallelBuilding = true; - - meta = { - description = "Photo Management Program"; - license = "GPL"; - homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ viric urkud ]; - inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index b07b889ca13e6..bdf8077624db2 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake , eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun , libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff -, libusb1, liblqr1, marble, mysql, opencv, phonon, pkgconfig, qca2 -, qimageblitz, qjson, qt4, soprano +, libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig +, qca2, qimageblitz, qjson, qt4, soprano }: stdenv.mkDerivation rec { @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; }; - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; buildInputs = [ - boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun - libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf - libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4 + boost eigen jasper kdelibs kdepimlibs lcms lensfun libgphoto2 + libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf libtiff marble + mysql.lib opencv phonon qca2 qimageblitz qjson qt4 shared_desktop_ontologies soprano ]; @@ -26,7 +26,11 @@ stdenv.mkDerivation rec { KDEDIRS="${marble}:${qjson}"; # Help digiKam find libusb, otherwise gphoto2 support is disabled - cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0 -DDIGIKAMSC_COMPILE_LIBKFACE=ON"; + cmakeFlags = [ + "-DLIBUSB_LIBRARIES=${libusb1}/lib" + "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" + "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 21caf8f800285..6eb57c3dd5f1d 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, kdelibs, automoc4, boost, pkgconfig, graphviz, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, boost, graphviz +}: stdenv.mkDerivation rec { name = "kgraphviewer-${version}"; @@ -9,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs"; }; - buildInputs = [ kdelibs automoc4 boost pkgconfig graphviz gettext ]; + buildInputs = [ kdelibs boost graphviz ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = with stdenv.lib; { description = "A Graphviz dot graph viewer for KDE"; diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix index 7a41064295856..cfecd19df46db 100644 --- a/pkgs/applications/graphics/kuickshow/default.nix +++ b/pkgs/applications/graphics/kuickshow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, imlib, cmake, pkgconfig, gettext }: +{ stdenv, fetchurl, automoc4, kdelibs, imlib, cmake, pkgconfig, gettext }: stdenv.mkDerivation rec { name = "kuickshow-0.9.1"; @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs imlib ]; - nativeBuildInputs = [ cmake gettext pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake gettext pkgconfig ]; } diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index 7730402a79593..f48912aeb1e7b 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,24 +1,25 @@ -{ stdenv, fetchurl, makeWrapper, cmake, qt4, perl, shared_mime_info, libvorbis, taglib -, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext -, transcode, cdrdao, cdrtools, dvdplusrwtools, vcdimager, cdparanoia -, kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null +{ stdenv, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig +, shared_mime_info, libvorbis, taglib , flac, libsamplerate +, libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao +, cdrtools, dvdplusrwtools, vcdimager, cdparanoia , kdelibs +, kdemultimedia, phonon, libkcddb ? null }: stdenv.mkDerivation rec { name = "k3b-2.0.3a"; - + src = fetchurl { url = "http://download.kde.org/stable/k3b/${name}.tar.xz"; sha256 = "10f07465g9860chfnvrp9w3m686g6j9f446xgnnx7h82d1sb42rd"; }; - buildInputs = - [ cmake qt4 perl shared_mime_info libvorbis taglib - flac libsamplerate libdvdread lame libsndfile - libmad gettext stdenv.cc.libc - kdelibs kdemultimedia automoc4 phonon - libkcddb makeWrapper cdparanoia - ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + + buildInputs = [ + shared_mime_info libvorbis taglib flac libsamplerate libdvdread + lame libsndfile libmad stdenv.cc.libc kdelibs + kdemultimedia phonon libkcddb makeWrapper cdparanoia + ]; enableParallelBuilding = true; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/k3b \ --prefix LD_LIBRARY_PATH ":" "${cdparanoia}/lib" ''; - + meta = with stdenv.lib; { description = "CD/DVD Burning Application for KDE"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index 1b71989f8b6b3..013efee8ec911 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, xf86_input_wacom }: stdenv.mkDerivation rec { name = "wacomtablet-2.1.0"; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs xf86_input_wacom ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = with stdenv.lib; { description = "KDE Wacom graphic tablet configuration tool"; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 51b7b90ca4efa..551d7c06468aa 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2 -, qjson +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson }: stdenv.mkDerivation rec { @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; }; - buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qjson ]; + buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ]; + + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; meta = with stdenv.lib; { description = "A tool to connect and sync your devices with KDE"; diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index ff98bb5186a76..1e4da7fa11f78 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, taglib, exiv2, podofo, qt4, phonon +}: stdenv.mkDerivation rec { name = "krename-4.0.9"; @@ -8,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds"; }; - buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ]; + buildInputs = [ kdelibs taglib exiv2 podofo qt4 phonon ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = { homepage = http://www.krename.net; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 83c21da0e542f..2a9c6305d42e2 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, gettext, kdelibs, kde_baseapps}: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, kde_baseapps +}: stdenv.mkDerivation rec { name = "krusader-2.4.0-beta1"; @@ -6,7 +8,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/krusader/${name}.tar.bz2"; sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6"; }; - buildInputs = [ gettext kdelibs kde_baseapps ]; + buildInputs = [ kdelibs kde_baseapps ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions meta = { description = "Norton/Total Commander clone for KDE"; diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index 6587fb2debf24..42247572c2469 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, kdebase_workspace }: let version = "0.11"; in @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519"; }; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; buildInputs = [ kdelibs kdebase_workspace ]; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 323782d60fe0a..10b63d1db514a 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, gettext, konsole }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, konsole }: let pname = "yakuake"; @@ -14,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ kdelibs ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; patchPhase = '' substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\"" diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix index cb3a0e9eac492..173ffcb933047 100644 --- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix +++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, kdelibs }: +{ stdenv, fetchgit, automoc4, cmake, perl, pkgconfig, kdelibs }: stdenv.mkDerivation rec { name = "kwebkitpart-${version}"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index ce36e26d6fccd..df8ad1eb35082 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kde4, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kde4, shared_desktop_ontologies, qca2, qoauth }: assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 @@ -12,7 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ kde4.kdelibs qca2 qoauth ]; - nativeBuildInputs = [ gettext pkgconfig shared_desktop_ontologies ]; + nativeBuildInputs = [ + automoc4 cmake gettext perl pkgconfig shared_desktop_ontologies + ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 564952480f23b..532d68ad66050 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs, farstream -, pkgconfigUpstream , qt_gstreamer1, telepathy_glib, telepathy_logger, qjson, flex, bison, qca2 }: +{ stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig +, telepathy_qt, kdelibs, kde_workspace, dbus_glib, dbus_libs, farstream +, qt_gstreamer1, telepathy_glib, telepathy_logger +, qjson, flex, bison, qca2 }: let - pkgconfig = pkgconfigUpstream; version = "0.8.80"; manifest = import (./. + "/${version}.nix"); overrides = { + call_ui = x : x // { + NIX_CFLAGS_COMPILE = + "-I${telepathy_glib}/include/telepathy-1.0" + + " -I${dbus_glib}/include/dbus-1.0" + + " -I${dbus_libs}/include/dbus-1.0"; + }; telepathy_logger_qt = x : x // { NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0"; }; @@ -38,7 +45,9 @@ let inherit sha256; }; - nativeBuildInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); + nativeBuildInputs = + [ automoc4 cmake gettext perl pkgconfig ] + ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); buildInputs = [ kdelibs telepathy_qt ] ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs); diff --git a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch b/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch new file mode 100644 index 0000000000000..6d1d2bac409bb --- /dev/null +++ b/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch @@ -0,0 +1,33 @@ +From 6b5730e729d72c8d9242163e7061b956abee61f5 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sat, 12 Sep 2015 16:14:10 -0500 +Subject: [PATCH] search paths + +--- + src/utilities/utility.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/utilities/utility.cpp b/src/utilities/utility.cpp +index 2e322aa..2e9e4d2 100644 +--- a/src/utilities/utility.cpp ++++ b/src/utilities/utility.cpp +@@ -299,6 +299,7 @@ QString Utility::searchExternalPrograms(const QString& programToSearch, bool& pr + + QString programPathName; + QStringList searchPathList = Settings::searchPathList(); ++ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z"; + + QStringList programsWithDifferentNames = programToSearch.split(";"); + +@@ -368,7 +369,7 @@ QStringList Utility::buildPriorityArgument(const int& processPriority, const int + QStringList niceProcessArgs; + + // look for 'nice' location : +- QString nicePath = KStandardDirs::findExe("nice"); ++ QString nicePath = QString("/usr/bin/nice"); + niceProcessArgs.append(nicePath); + niceProcessArgs.append("-n"); + +-- +2.5.0 + diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix index e49e2c6fe261b..d8e417cdd3a88 100644 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -5,17 +5,17 @@ , unrar, p7zip, par2cmdline, coreutils }: -let version = "0.8.4"; +let version = "1.1.0"; name = "kwooty-${version}"; in stdenv.mkDerivation { inherit name; - + src = fetchurl { - url = "mirror://sourceforge/kwooty/${name}.tar.gz"; - sha256 = "0i3zmh7y52n5k0yn3xc6zjpjz75f48nly40n394i6sxy89psgfc2"; + url = "http://kde-apps.org/CONTENT/content-files/114385-${name}.tar.gz"; + sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap"; }; - patches = [ ./searchPath.patch ]; + patches = [ ./0001-search-paths.patch ]; postPatch = '' echo "Changing paths to archive utilities to the nix store"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { kdelibs kdebase_workspace phonon libX11 libXext libXft ]; - + meta = { description = "Binary news reader of KDE"; }; diff --git a/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch b/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch deleted file mode 100644 index 602002d0173f0..0000000000000 --- a/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kwooty-kwooty/src/utility.cpp 2012-01-24 22:22:45.091383072 +0100 -+++ kwooty-kwooty/src/utility.cpp 2012-01-24 22:29:08.526208140 +0100 -@@ -299,6 +299,7 @@ - - QString programPathName; - QStringList searchPathList = Settings::searchPathList(); -+ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z"; - - QStringList programsWithDifferentNames = programToSearch.split(";"); - -@@ -363,7 +364,7 @@ - QStringList niceProcessArgs; - - // look for 'nice' location : -- QString nicePath = KStandardDirs::findExe("nice"); -+ QString nicePath = QString("/usr/bin/nice"); - niceProcessArgs.append(nicePath); - niceProcessArgs.append("-n"); - diff --git a/pkgs/applications/office/basket/default.nix b/pkgs/applications/office/basket/default.nix index 023d133b4dd73..2417e263d4427 100644 --- a/pkgs/applications/office/basket/default.nix +++ b/pkgs/applications/office/basket/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, gettext, kdelibs, qimageblitz, kdepimlibs, gpgme }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, qimageblitz, kdepimlibs, gpgme +}: stdenv.mkDerivation rec { name = "basket-1.81"; @@ -12,8 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ]; - nativeBuildInputs = [ cmake gettext ]; - + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + meta = { description = "A multi-purpose note-taking application"; homepage = http://basket.kde.org/; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 0b28d13e4e557..3d1eada1db617 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa +{ stdenv, fetchurl, automoc4, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular , libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase , libodfgen, opencolorio, openjpeg, pstoedit, librevenge - }: +}: stdenv.mkDerivation rec { name = "calligra-2.8.7"; @@ -14,12 +14,13 @@ stdenv.mkDerivation rec { sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg"; }; - nativeBuildInputs = [ cmake perl pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; # TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers # not found: xbase, openjpeg(too new) - buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs + buildInputs = [ + kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl shared_desktop_ontologies okular libodfgen opencolorio openjpeg diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index c260220aad4d7..395cb3d0a9145 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext, boost }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, kdepimlibs, akonadi, boost }: stdenv.mkDerivation rec { name = "plasmoid-eventlist-0.6.96"; @@ -8,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea"; }; - buildInputs = [ kdelibs kdepimlibs akonadi gettext boost ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + buildInputs = [ kdelibs kdepimlibs akonadi boost ]; meta = { inherit (kdelibs.meta) platforms; diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index b3e62b8e0511b..a18ba50cabe29 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/pkgs/applications/office/kbibtex/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, kdelibs, libxslt, poppler_qt4 }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, libxslt, poppler_qt4 +}: stdenv.mkDerivation rec { pname = "kbibtex"; @@ -15,4 +17,5 @@ stdenv.mkDerivation rec { ''; buildInputs = [ kdelibs libxslt poppler_qt4 ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; } diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 52dd08e1e0d81..712725f527531 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext, boost }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig, shared_mime_info +, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, boost }: stdenv.mkDerivation rec { name = "skrooge-1.10.0"; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig shared_mime_info ]; meta = { inherit (kdelibs.meta) platforms; diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 1233428825424..7ae758d7e4f7c 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, kdepimlibs, boost }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, kdepimlibs, boost }: stdenv.mkDerivation rec { name = "zanshin-0.2.1"; @@ -8,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "155k72vk7kw0p0x9dhlky6q017kanzcbwvp4dpf1hcbr1dsr55fx"; }; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + buildInputs = [ kdelibs kdepimlibs boost ]; meta = { diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 60f5d8bb9e08d..b94978bb48812 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db, kdelibs, expat }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, apr, aprutil, subversion, db, kdelibs, expat +}: # the homepage mentions this is the final release. # from now on, kdesvn will be part of the official kde software distribution @@ -16,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ apr aprutil subversion db kdelibs expat ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = { description = "KDE SVN front-end"; diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index f962b52dd6273..ceece8879dcb9 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, phonon, soprano, shared_desktop_ontologies +, kdemultimedia, taglib, glibc, gettext +}: + stdenv.mkDerivation rec { name = "bangarang-2.1"; @@ -7,8 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1"; }; - buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ]; - nativeBuildInputs = [ cmake ]; + buildInputs = [ + kdelibs phonon soprano shared_desktop_ontologies kdemultimedia + taglib gettext + ]; + + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; patches = [ ./gcc-4.7.patch ]; diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 70558eb39a4cb..047f230118557 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchurl, cmake, automoc4, qt5, kf5, dvdauthor, xineLib, libmpeg2, libav, -libdvdread, libdvdnav, dvdplusrwtools, phonon_qt5 }: +{ stdenv, fetchurl +, cmake, automoc4 +, dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools +, phonon, qtx11extras +, extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid +}: stdenv.mkDerivation rec { version = "3.0.3"; @@ -30,18 +34,17 @@ stdenv.mkDerivation rec { libdvdread libdvdnav dvdplusrwtools - automoc4 - phonon_qt5 - ] ++ (with kf5; [ + #automoc4 + phonon extra-cmake-modules kio solid - qt5.x11extras + qtx11extras kiconthemes ki18n kdesu - kdoctools - ]); + ]; + nativeBuildInputs = [ kdoctools ]; meta = { description = "DVD backup and DVD authoring program"; diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index f29ad00ea9e39..3da5180352c66 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -14,9 +14,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - automoc4 cmake frei0r gettext kdelibs libv4l makeWrapper mlt perl - phonon pkgconfig qimageblitz qjson qt4 shared_desktop_ontologies - shared_mime_info soprano + frei0r kdelibs libv4l mlt phonon qimageblitz qjson qt4 + shared_desktop_ontologies soprano + ]; + + nativeBuildInputs = [ + automoc4 cmake gettext makeWrapper perl pkgconfig shared_mime_info ]; propagatedUserEnvPkgs = [ oxygen_icons ]; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 8d4a328cc0948..2e62cb139e34a 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext, makeWrapper +{ stdenv, fetchurl +, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig , kdelibs, cairo, dbus_glib, mplayer }: @@ -11,10 +12,9 @@ stdenv.mkDerivation { sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; }; - buildInputs = [ - cmake gettext pkgconfig makeWrapper - kdelibs cairo dbus_glib - ]; + buildInputs = [ kdelibs cairo dbus_glib ]; + + nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ]; postInstall = '' wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin diff --git a/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch b/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch new file mode 100644 index 0000000000000..cd19b7e2d72ab --- /dev/null +++ b/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch @@ -0,0 +1,36 @@ +From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Mon, 7 Sep 2015 18:55:44 -0500 +Subject: [PATCH] ksysguard disable signalplottertest + +--- + libs/ksysguard/tests/CMakeLists.txt | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt +index d472fd7..f178b71 100644 +--- a/libs/ksysguard/tests/CMakeLists.txt ++++ b/libs/ksysguard/tests/CMakeLists.txt +@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB + set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp) + kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} ) + target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) +- +- +-# KGraphicsSignalPlotter benchmark +-set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp) +-kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} ) +-target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) +- +- +-# KSignalPlotter unit test +-set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp) +-kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} ) +-target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ) +- +- +- +- +-- +2.5.0 + diff --git a/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch new file mode 100644 index 0000000000000..4127b16d5f6d6 --- /dev/null +++ b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch @@ -0,0 +1,62 @@ +From 93081f817f20bbc26b55e1b37b22d60535d153f7 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Thu, 10 Sep 2015 18:41:57 -0500 +Subject: [PATCH] duplicate add_test + +--- + RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt | 1 - + RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt | 1 - + RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt | 1 - + RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt | 1 - + RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt | 1 - + 5 files changed, 5 deletions(-) + +diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt +index 32a2504..4fbb838 100644 +--- a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt +@@ -33,4 +33,3 @@ target_link_libraries(TestDotFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestDotFileFormatPlugin TestDotFileFormatPlugin) +diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt +index 615004c..6383bd8 100644 +--- a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt +@@ -32,4 +32,3 @@ target_link_libraries(TestGmlFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestGmlFileFormatPlugin TestGmlFileFormatPlugin) +diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt +index f9cdbfa..842d14b 100644 +--- a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt +@@ -30,4 +30,3 @@ target_link_libraries(TestKmlFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestKmlFileFormatPlugin TestKmlFileFormatPlugin) +diff --git a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt +index 33c0da8..70cab8d 100644 +--- a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt +@@ -35,4 +35,3 @@ target_link_libraries(TestTgfFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestTgfFileFormatPlugin TestTgfFileFormatPlugin) +diff --git a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt +index b52736e..58ee40e 100644 +--- a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt +@@ -29,5 +29,4 @@ target_link_libraries(TestTikzFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestTikzFileFormatPlugin TestTikzFileFormatPlugin) + +-- +2.5.0 + diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index c78dfbd8a36a3..52600e183bdd1 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -1,4 +1,4 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 +{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4, perl, pkgconfig , release, branch, ignoreList, extraSubpkgs }: @@ -29,13 +29,14 @@ rec { # released as individual tarballs kdeMonoPkg = name: let n_ = name; v_ = getAttr name manifest.versions; in - a@{meta, name ? n_, version ? v_, ...}: + a@{meta, name ? n_, version ? v_, nativeBuildInputs ? [], ...}: stdenv.mkDerivation ({ name = "${name}-${version}"; src = kdesrc name version; + nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ]; meta = defMeta // meta; enableParallelBuilding = true; - } // (removeAttrs a [ "meta" "name" ])); + } // (removeAttrs a [ "meta" "name" "nativeBuildInputs" ])); # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs # API. @@ -45,10 +46,11 @@ rec { kdeSubdirPkg = module: {name, subdir ? name, sane ? name}: let name_ = name; version_ = getAttr module manifest.versions; in - a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, ...}: + a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, nativeBuildInputs ? [], ...}: stdenv.mkDerivation ({ name = "${name}-${release}"; src = kdesrc module version; + nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ]; cmakeFlags = [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" "-DBUILD_doc=TRUE" @@ -56,7 +58,7 @@ rec { ] ++ cmakeFlags; meta = defMeta // meta; enableParallelBuilding = module.enableParallelBuilding or true; - } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); + } // (removeAttrs a [ "meta" "name" "cmakeFlags" "nativeBuildInputs" ])); # A KDE monolithic module kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index ddda04fd37050..ae4959662626c 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2 +{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme }: @@ -14,7 +14,7 @@ kde { #todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ shared_mime_info ]; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; diff --git a/pkgs/desktops/kde-4.14/kde-workspace.nix b/pkgs/desktops/kde-4.14/kde-workspace.nix index 75863e1fe99bc..53df146ab5332 100644 --- a/pkgs/desktops/kde-4.14/kde-workspace.nix +++ b/pkgs/desktops/kde-4.14/kde-workspace.nix @@ -18,7 +18,7 @@ kde { kactivities ]; - nativeBuildInputs = [ pkgconfig ]; + patches = [ ./files/ksysguard-0001-disable-signalplottertest.patch ]; preConfigure = '' diff --git a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix index ce30d11fda316..76131d8f0f0f9 100644 --- a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix +++ b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix @@ -1,6 +1,8 @@ { kde, kdelibs, boost, grantlee }: kde { + patches = [ ../files/rocs-0001-duplicate-add_test.patch ]; + buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ]; NIX_CFLAGS_COMPILE = "-fexceptions"; diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix index f8d9bad36dc51..b60afa786d17e 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kpat.nix @@ -1,6 +1,7 @@ -{ kde, kdelibs, libkdegames }: +{ kde, kdelibs, libkdegames, shared_mime_info }: kde { buildInputs = [ kdelibs libkdegames ]; + nativeBuildInputs = [ shared_mime_info ]; meta = { description = "a relaxing card sorting game"; }; diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix index 010dbd5d62329..ddecc78c75bcd 100644 --- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix +++ b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix @@ -1,8 +1,10 @@ -{ kde, kdelibs, libkdegames }: +{ kde, kdelibs, libkdegames, shared_mime_info }: kde { # TODO: package qvoronoi + nativeBuildInputs = [ shared_mime_info ]; + buildInputs = [ kdelibs libkdegames ]; meta = { diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix index 1d5c6e2fcb4af..18697e13b66c0 100644 --- a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix @@ -4,8 +4,6 @@ kde { buildInputs = [ kdelibs libraw lcms2 ]; - nativeBuildInputs = [ pkgconfig ]; - meta = { description = "Library for decoding RAW images"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix index 526ac069e6194..b990628889b6b 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix @@ -1,5 +1,5 @@ { stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4 -, pkgconfig, doxygen, ebook_tools +, pkgconfig, doxygen, ebook_tools, automoc4, cmake, perl }: kde { @@ -11,7 +11,7 @@ kde { poppler_qt4 ebook_tools ]; - nativeBuildInputs = [ pkgconfig doxygen ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig doxygen ]; meta = { description = "NEPOMUK core"; diff --git a/pkgs/desktops/kde-4.14/kdepim-runtime.nix b/pkgs/desktops/kde-4.14/kdepim-runtime.nix index d92e225482065..e5061a8790aff 100644 --- a/pkgs/desktops/kde-4.14/kdepim-runtime.nix +++ b/pkgs/desktops/kde-4.14/kdepim-runtime.nix @@ -1,4 +1,5 @@ -{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }: +{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies +, shared_mime_info }: kde { @@ -9,6 +10,8 @@ kde { libxslt ]; + nativeBuildInputs = [ shared_mime_info ]; + meta = { description = "KDE PIM runtime"; license = "GPL"; diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index e0f355acdd950..ac62c970eec04 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -1,13 +1,20 @@ { kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison , kdelibs, akonadi, libxslt, nepomuk_core -, shared_desktop_ontologies, qjson }: +, shared_mime_info, shared_desktop_ontologies, qjson +, automoc4, cmake, perl +}: kde { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + cmakeFlags = [ + "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3" + ]; buildInputs = [ boost gpgme libical libxslt qjson prison openldap cyrus_sasl akonadi shared_desktop_ontologies + shared_mime_info ]; propagatedBuildInputs = [ kdelibs nepomuk_core ]; diff --git a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix index 2b1f1628cf1da..b4d24f47e4905 100644 --- a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix @@ -1,7 +1,7 @@ { kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig , boost, eigen2, kde_workspace, attica, qca2, qimageblitz , kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt -, qjson, qoauth }: +, qjson, qoauth, shared_mime_info }: kde { @@ -14,7 +14,7 @@ kde { shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ shared_mime_info ]; meta = { description = "KDE Plasma Addons"; diff --git a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix index 058636596ad81..77108c76adc38 100644 --- a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix +++ b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix @@ -1,8 +1,10 @@ -{ kde, kdelibs, qca2 }: +{ kde, kdelibs, qca2, shared_mime_info }: kde { buildInputs = [ kdelibs qca2 ]; + nativeBuildInputs = [ shared_mime_info ]; + # TODO: Look what does -DBUILD_mobile add enableParallelBuilding = false; diff --git a/pkgs/desktops/kde-4.14/l10n/default.nix b/pkgs/desktops/kde-4.14/l10n/default.nix index fa6406043b1b3..b4c272cb328ec 100644 --- a/pkgs/desktops/kde-4.14/l10n/default.nix +++ b/pkgs/desktops/kde-4.14/l10n/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, gettext, release, branch, stable +}: let @@ -18,7 +20,11 @@ let buildInputs = [ gettext kdelibs ]; - cmakeFlags = "-Wno-dev"; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + cmakeFlags = [ + "-Wno-dev" + ]; meta = { description = "KDE translation for ${lang}"; diff --git a/pkgs/development/libraries/libalkimia/default.nix b/pkgs/development/libraries/libalkimia/default.nix index d372c5cf8fc9e..bcb699da828f1 100644 --- a/pkgs/development/libraries/libalkimia/default.nix +++ b/pkgs/development/libraries/libalkimia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, kdelibs, gmpxx }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, gmpxx }: stdenv.mkDerivation rec { name = "libalkimia-4.3.2"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; patchPhase = "sed -e 's/KDE4_DATA_DIR/DATA_INSTALL_DIR/' -i CMakeLists.txt"; - buildInputs = [ pkgconfig kdelibs gmpxx ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + buildInputs = [ kdelibs gmpxx ]; meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; diff --git a/pkgs/development/libraries/libkvkontakte/default.nix b/pkgs/development/libraries/libkvkontakte/default.nix index 2a346abed74b7..152fe0894af8e 100644 --- a/pkgs/development/libraries/libkvkontakte/default.nix +++ b/pkgs/development/libraries/libkvkontakte/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, pkgconfig, qjson, kdelibs }: +{ stdenv, fetchgit, automoc4, cmake, pkgconfig, qjson, kdelibs }: stdenv.mkDerivation { - name = "libkvkonatkte-1.0-pre20120103"; + name = "libkvkontakte-1.0-pre20120103"; src = fetchgit { url = git://anongit.kde.org/libkvkontakte; @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0ryvjfrsws845k9s76715xid48y01h0ynb5wdx6ln8cm5z5wqj61"; }; - buildInputs = [ pkgconfig qjson kdelibs ]; + nativeBuildInputs = [ automoc4 cmake pkgconfig ]; + buildInputs = [ qjson kdelibs ]; meta = { homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte; diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index e21f5ed15e9ed..7342b866a48f8 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, kgraphviewer, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, kgraphviewer }: stdenv.mkDerivation rec { name = "massif-visualizer-${version}"; @@ -9,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "9940fa90137ca5eef08b9ec220825fadbf03db423a670a2c7fe3edab271d9922"; }; - buildInputs = [ kdelibs kgraphviewer gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + buildInputs = [ kdelibs kgraphviewer ]; meta = with stdenv.lib; { description = "Tool that visualizes massif data generated by valgrind"; diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 2aa73f1e0c174..cc11aab81cd8b 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig , gtk2, kde_workspace, kdelibs # Toolkit dependencies , libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies }: @@ -10,9 +10,9 @@ stdenv.mkDerivation { sha256 = "19kk11hgi6md1cl0hr0pklcczbl66jczahlkf5fr8j59ljgpr6c5"; }; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + buildInputs = [ - cmake - gettext gtk2 kde_workspace kdelibs diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 55260b269c6d9..606595f46057e 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, colord, libX11, libXrandr, lcms2, pkgconfig, kdelibs}: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, colord, libX11, libXrandr, lcms2, kdelibs +}: stdenv.mkDerivation { name = "colord-kde-0.3.0"; @@ -8,7 +10,9 @@ stdenv.mkDerivation { sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09"; }; - buildInputs = [ cmake colord libX11 libXrandr lcms2 pkgconfig kdelibs ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix index 88df0b6b54452..809d0c65c6ece 100644 --- a/pkgs/tools/misc/kde-gtk-config/default.nix +++ b/pkgs/tools/misc/kde-gtk-config/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, cmake, gettext, gtk2, gtk3, kdelibs -, libxcb, libpthreadstubs, libXdmcp, pkgconfig, glib, gdk_pixbuf }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, gtk2, gtk3, kdelibs, libxcb, libpthreadstubs, libXdmcp +, glib, gdk_pixbuf +}: stdenv.mkDerivation { name = "kde-gtk-config-2.2.1"; @@ -9,19 +11,11 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake - gdk_pixbuf - gettext - glib - gtk2 - gtk3 - kdelibs - libxcb - libpthreadstubs - libXdmcp - pkgconfig + gdk_pixbuf glib gtk2 gtk3 kdelibs libxcb libpthreadstubs libXdmcp ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + patches = [ ./kde-gtk-config-2.2.1-install-paths.patch ./kde-gtk-config-follow-symlinks.patch diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix index 5d07e6c26ec44..17f809ddb8c94 100644 --- a/pkgs/tools/networking/plasma-nm/default.nix +++ b/pkgs/tools/networking/plasma-nm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, cmake, gettext, kdelibs, networkmanager, libnm-qt }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, networkmanager, libnm-qt }: let pname = "plasma-nm"; @@ -13,14 +14,9 @@ stdenv.mkDerivation { sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751"; }; - buildInputs = [ - cmake - pkgconfig - gettext - kdelibs - networkmanager - libnm-qt - ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + + buildInputs = [ kdelibs networkmanager libnm-qt ]; meta = with stdenv.lib; { homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm"; diff --git a/pkgs/tools/security/ksshaskpass/default.nix b/pkgs/tools/security/ksshaskpass/default.nix index 1c777294c9bb1..a668f57c5bbee 100644 --- a/pkgs/tools/security/ksshaskpass/default.nix +++ b/pkgs/tools/security/ksshaskpass/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, kdelibs}: +{ stdenv, fetchurl, kdelibs +, automoc4, cmake, perl, pkgconfig +}: stdenv.mkDerivation { name = "ksshaskpass-0.5.3"; @@ -8,6 +10,8 @@ stdenv.mkDerivation { sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953"; }; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + buildInputs = [ kdelibs ]; patchPhase = '' diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix index b3990b53a87a5..6b4bcf7ad637c 100644 --- a/pkgs/tools/security/polkit-kde-agent/default.nix +++ b/pkgs/tools/security/polkit-kde-agent/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, polkit_qt4, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, polkit_qt4 }: stdenv.mkDerivation rec { name = "polkit-kde-agent-1-0.99.0"; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs polkit_qt4 ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt"; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index eb8db0a44a5f7..664fb87b5205b 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, kdelibs, gettext }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, gettext +}: stdenv.mkDerivation rec { name = "kdiff3-0.9.98"; @@ -8,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ kdelibs ]; - nativeBuildInputs = [ cmake gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = { homepage = http://kdiff3.sourceforge.net/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 325efb2b70fb7..d493bc5f76c7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13908,7 +13908,7 @@ let libusb = libusb1; libcanberra = libcanberra_kde; boost = boost155; - kdelibs = kdeApps_stable.kdelibs; + kdelibs = kdeApps_15_08.kdelibs; } ../desktops/kde-4.14; @@ -13933,10 +13933,7 @@ let colord-kde = callPackage ../tools/misc/colord-kde { }; - digikam = if builtins.compareVersions "4.9" kde4.release == 1 then - callPackage ../applications/graphics/digikam/2.nix { } - else - callPackage ../applications/graphics/digikam { }; + digikam = callPackage ../applications/graphics/digikam { }; eventlist = callPackage ../applications/office/eventlist {}; |