kde5: fix all the Qt version dependencies

This commit is contained in:
Thomas Tuegel 2016-07-29 21:13:00 -05:00
parent 0925700688
commit 40b838b94d
30 changed files with 151 additions and 391 deletions

View file

@ -1,7 +1,7 @@
{
kdeApp, lib,
extra-cmake-modules, kdoctools, makeQtWrapper,
ecm, kdoctools, makeQtWrapper,
karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
kservice, kpty, kwidgetsaddons, libarchive,
@ -13,7 +13,7 @@
kdeApp {
name = "ark";
nativeBuildInputs = [
extra-cmake-modules kdoctools makeQtWrapper
ecm kdoctools makeQtWrapper
];
propagatedBuildInputs = [
khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice

View file

@ -1,14 +1,7 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, kconfig
, kio
, ki18n
, kservice
, kfilemetadata
, baloo
, kdelibs4support
{
kdeApp, lib,
ecm, kdoctools,
baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice
}:
kdeApp {
@ -17,11 +10,8 @@ kdeApp {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [
baloo kconfig kservice kdelibs4support kfilemetadata ki18n kio
baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice
];
}

View file

@ -23,6 +23,7 @@ let
kdeApp = import ./kde-app.nix {
inherit kdeDerivation lib;
inherit debug srcs;
inherit (pkgs) cmake pkgconfig;
};
kdelibs = callPackage ./kdelibs {
@ -54,9 +55,7 @@ let
libkexiv2 = callPackage ./libkexiv2.nix {};
libkipi = callPackage ./libkipi.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
okular = callPackage ./okular.nix {
inherit (srcs.okular) src version;
};
okular = callPackage ./okular.nix {};
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};

View file

@ -1,12 +1,7 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, kxmlgui
, ki18n
, kio
, kdelibs4support
, dolphin
{
kdeApp, lib,
ecm, kdoctools,
dolphin, kdelibs4support, ki18n, kio, kxmlgui
}:
kdeApp {
@ -15,11 +10,6 @@ kdeApp {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
propagatedBuildInputs = [
kdelibs4support ki18n kio kxmlgui dolphin
];
nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [ dolphin kdelibs4support ki18n kio kxmlgui ];
}

View file

@ -1,30 +1,10 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, kinit
, kcmutils
, kcoreaddons
, knewstuff
, ki18n
, kdbusaddons
, kbookmarks
, kconfig
, kio
, kparts
, solid
, kiconthemes
, kcompletion
, ktexteditor
, kwindowsystem
, knotifications
, kactivities
, phonon
, baloo
, baloo-widgets
, kfilemetadata
, kdelibs4support
{
kdeApp, lib,
ecm, kdoctools, makeQtWrapper,
baloo, baloo-widgets, kactivities, kbookmarks, kcmutils, kcompletion, kconfig,
kcoreaddons, kdelibs4support, kdbusaddons, kfilemetadata, ki18n, kiconthemes,
kinit, kio, knewstuff, knotifications, kparts, ktexteditor, kwindowsystem,
phonon, solid
}:
kdeApp {
@ -33,16 +13,12 @@ kdeApp {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
propagatedBuildInputs = [
kinit kcmutils kcoreaddons knewstuff kdbusaddons kbookmarks kconfig kparts
solid kiconthemes kcompletion knotifications phonon baloo-widgets baloo
kactivities kdelibs4support kfilemetadata ki18n kio ktexteditor
kwindowsystem
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem phonon
solid
];
postInstall = ''
wrapQtProgram "$out/bin/dolphin"

View file

@ -1,8 +1,7 @@
{ kdeApp
, lib
, extra-cmake-modules
, ffmpeg
, kio
{
kdeApp, lib,
ecm,
ffmpeg, kio
}:
kdeApp {
@ -11,11 +10,6 @@ kdeApp {
license = with lib.licenses; [ gpl2 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
];
propagatedBuildInputs = [
ffmpeg
kio
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ ffmpeg kio ];
}

View file

@ -1,13 +1,7 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, qtscript
, kio
, solid
, kxmlgui
, kparts
{
kdeApp, lib,
ecm, kdoctools, makeQtWrapper,
kio, kparts, kxmlgui, qtscript, solid
}:
kdeApp {
@ -16,13 +10,9 @@ kdeApp {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh vcunat ];
};
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
propagatedBuildInputs = [
kio kparts qtscript solid kxmlgui
kio kparts kxmlgui qtscript solid
];
postInstall = ''
wrapQtProgram "$out/bin/filelight"

View file

@ -1,8 +1,7 @@
{ kdeApp
, lib
, extra-cmake-modules
, boost
, gpgme
{
kdeApp, lib,
ecm,
boost, gpgme
}:
kdeApp {
@ -11,10 +10,6 @@ kdeApp {
license = with lib.licenses; [ lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
];
propagatedBuildInputs = [
boost gpgme
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ boost gpgme ];
}

View file

@ -1,17 +1,8 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, baloo
, exiv2
, kactivities
, kdelibs4support
, kio
, lcms2
, phonon
, qtsvg
, qtx11extras
{
kdeApp, lib,
ecm, kdoctools, makeQtWrapper,
baloo, exiv2, kactivities, kdelibs4support, kio, lcms2, phonon,
qtsvg, qtx11extras
}:
kdeApp {
@ -20,11 +11,7 @@ kdeApp {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
propagatedBuildInputs = [
baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon qtsvg
];

View file

@ -1,9 +1,9 @@
{
kdeApp, lib, makeQtWrapper, extra-cmake-modules, kdoctools,
kdeApp, lib, makeQtWrapper, ecm, kdoctools,
kactivities, kconfig, kcrash, kguiaddons, kiconthemes, ki18n, kinit,
kjobwidgets, kio, kparts, ktexteditor, kwindowsystem, kxmlgui, kdbusaddons,
kwallet, plasma-framework, kitemmodels, knotifications, qtscript, threadweaver,
knewstuff, libgit2
kwallet, plasma-framework, kitemmodels, knotifications, qtscript,
threadweaver, knewstuff, libgit2
}:
kdeApp {
@ -12,9 +12,7 @@ kdeApp {
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules kdoctools makeQtWrapper
];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
propagatedBuildInputs = [
kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript
kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui

View file

@ -1,6 +1,6 @@
{
kdeApp, lib, makeQtWrapper, kdoctools,
extra-cmake-modules, kconfig, kconfigwidgets, kguiaddons, kinit,
ecm, kconfig, kconfigwidgets, kguiaddons, kinit,
knotifications, gmp
}:
@ -10,7 +10,7 @@ kdeApp {
license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.fridh ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
propagatedBuildInputs = [
gmp kconfig kconfigwidgets kguiaddons kinit knotifications
];

View file

@ -1,6 +1,6 @@
{ kdeApp, lib
, extra-cmake-modules
, ki18n, kwidgetsaddons, kxmlgui
{
kdeApp, lib,
ecm, ki18n, kwidgetsaddons, kxmlgui
}:
kdeApp {
@ -9,6 +9,6 @@ kdeApp {
license = with lib.licenses; [ mit ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
}

View file

@ -1,4 +1,4 @@
{ kdeDerivation, lib, debug, srcs }:
{ kdeDerivation, lib, debug, srcs, cmake, pkgconfig }:
args:
@ -11,6 +11,15 @@ kdeDerivation (args // {
name = "${name}-${version}";
inherit src;
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
nativeBuildInputs =
(args.nativeBuildInputs or [])
++ [ cmake pkgconfig ];
meta = {
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";

View file

@ -1,6 +1,6 @@
name: args:
{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
{ kdeApp, cmake, ecm, gettext, kdoctools }:
kdeApp (args // {
sname = "kde-l10n-${name}";
@ -9,7 +9,7 @@ kdeApp (args // {
outputs = [ "out" ];
nativeBuildInputs =
[ cmake extra-cmake-modules gettext kdoctools ]
[ cmake ecm gettext kdoctools ]
++ (args.nativeBuildInputs or []);
preConfigure = ''

View file

@ -1,9 +1,6 @@
{ kdeApp
, lib
, extra-cmake-modules
, kio
, libkexiv2
, libkdcraw
{
kdeApp, lib,
ecm, kio, libkexiv2, libkdcraw
}:
kdeApp {
@ -12,10 +9,6 @@ kdeApp {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
];
propagatedBuildInputs = [
kio libkexiv2 libkdcraw
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ kio libkexiv2 libkdcraw ];
}

View file

@ -1,14 +1,13 @@
{
stdenv, lib, src, version,
kdeApp, lib, src, version,
automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
shared_desktop_ontologies, soprano, strigi, udev, xz, pcre
}:
stdenv.mkDerivation {
name = "kdelibs-${version}";
inherit src;
kdeApp {
name = "kdelibs";
outputs = [ "out" ];

View file

@ -1,12 +1,7 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, kcoreaddons
, ki18n
, kio
, kwidgetsaddons
, samba
{
kdeApp, lib,
ecm, kdoctools,
kcoreaddons, ki18n, kio, kwidgetsaddons, samba
}:
kdeApp {
@ -15,11 +10,6 @@ kdeApp {
license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
propagatedBuildInputs = [
kcoreaddons ki18n kio kwidgetsaddons samba
];
nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
}

View file

@ -1,32 +1,13 @@
{ kdeApp
, lib
, automoc4
, cmake
, makeWrapper
, perl
, pkgconfig
, boost
, gpgme
, kdelibs
, kdepimlibs
, gnupg
{
kdeApp, lib,
automoc4, cmake, makeWrapper, perl, pkgconfig,
boost, gpgme, kdelibs, kdepimlibs, gnupg
}:
kdeApp {
name = "kgpg";
nativeBuildInputs = [
automoc4
cmake
makeWrapper
perl
pkgconfig
];
buildInputs = [
boost
gpgme
kdelibs
kdepimlibs
];
nativeBuildInputs = [ automoc4 cmake makeWrapper perl pkgconfig ];
buildInputs = [ boost gpgme kdelibs kdepimlibs ];
postInstall = ''
wrapProgram "$out/bin/kgpg" \
--prefix PATH : "${gnupg}/bin"

View file

@ -1,18 +1,15 @@
{ kdeApp, extra-cmake-modules, kdoctools, makeQtWrapper
, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils
, kdelibs4support, khtml, kservice
, xapian
{
kdeApp, ecm, kdoctools, makeQtWrapper,
grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
kdelibs4support, khtml, kservice, xapian
}:
kdeApp {
name = "khelpcenter";
nativeBuildInputs = [
extra-cmake-modules kdoctools makeQtWrapper
];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
buildInputs = [
grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit
kcmutils kservice
xapian
kcmutils kservice xapian
];
postInstall = ''
wrapQtProgram "$out/bin/khelpcenter"

View file

@ -1,26 +1,9 @@
{ kdeApp, lib
, extra-cmake-modules, kdoctools
, shared_mime_info
, exiv2
, kactivities, karchive
, kbookmarks
, kconfig, kconfigwidgets
, kcoreaddons, kdbusaddons, kguiaddons
, kdnssd
, kiconthemes
, ki18n
, kio
, khtml
, kdelibs4support
, kpty
, libmtp
, libssh
, openexr, ilmbase
, openslp
, phonon
, qtsvg
, samba
, solid
{
kdeApp, lib, ecm, kdoctools, shared_mime_info,
exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
qtsvg, samba, solid
}:
kdeApp {
@ -29,10 +12,7 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules kdoctools
shared_mime_info
];
nativeBuildInputs = [ ecm kdoctools shared_mime_info ];
propagatedBuildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support

View file

@ -1,12 +1,6 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, kparts
, ktexteditor
, kwidgetsaddons
, libkomparediff2
{
kdeApp, lib, ecm, kdoctools, makeQtWrapper,
kparts, ktexteditor, kwidgetsaddons, libkomparediff2
}:
kdeApp {
@ -15,18 +9,9 @@ kdeApp {
license = with lib.licenses; [ gpl2 ];
};
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
propagatedBuildInputs = [
kparts
ktexteditor
kwidgetsaddons
libkomparediff2
];
propagatedBuildInputs = [ kparts ktexteditor kwidgetsaddons libkomparediff2 ];
postInstall = ''
wrapQtProgram "$out/bin/kompare"

View file

@ -1,29 +1,10 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, qtscript
, kbookmarks
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kguiaddons
, ki18n
, kiconthemes
, kinit
, kdelibs4support
, kio
, knotifications
, knotifyconfig
, kparts
, kpty
, kservice
, ktextwidgets
, kwidgetsaddons
, kwindowsystem
, kxmlgui
{
kdeApp, lib,
ecm, kdoctools, makeQtWrapper,
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
kwindowsystem, kxmlgui, qtscript
}:
kdeApp {
@ -32,9 +13,7 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules kdoctools makeQtWrapper
];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
propagatedBuildInputs = [
kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kconfig
kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio knotifications

View file

@ -1,8 +1,4 @@
{ kdeApp
, lib
, extra-cmake-modules
, libraw
}:
{ kdeApp, lib, ecm, libraw }:
kdeApp {
name = "libkdcraw";
@ -10,10 +6,6 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
];
propagatedBuildInputs = [
libraw
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ libraw ];
}

View file

@ -1,8 +1,4 @@
{ kdeApp
, lib
, exiv2
, extra-cmake-modules
}:
{ kdeApp, lib, exiv2, ecm }:
kdeApp {
name = "libkexiv2";
@ -10,10 +6,6 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
];
propagatedBuildInputs = [
exiv2
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ exiv2 ];
}

View file

@ -1,11 +1,4 @@
{ kdeApp
, lib
, extra-cmake-modules
, kconfig
, ki18n
, kservice
, kxmlgui
}:
{ kdeApp, lib, ecm, kconfig, ki18n, kservice, kxmlgui }:
kdeApp {
name = "libkipi";
@ -13,10 +6,6 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
];
propagatedBuildInputs = [
kconfig ki18n kservice kxmlgui
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ];
}

View file

@ -1,23 +1,7 @@
{ kdeApp
, lib
, extra-cmake-modules
, ki18n
, kxmlgui
, kcodecs
, kio
}:
{ kdeApp, lib, ecm, ki18n, kxmlgui, kcodecs, kio }:
kdeApp {
name = "libkomparediff2";
nativeBuildInputs = [
extra-cmake-modules
];
propagatedBuildInputs = [
kcodecs
ki18n
kxmlgui
kio
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ];
}

View file

@ -1,14 +1,12 @@
{
stdenv, lib,
src, version,
automoc4, cmake, perl, pkgconfig, kdelibs, qimageblitz,
poppler_qt4, libspectre, libkexiv2, djvulibre, libtiff, freetype,
ebook_tools
}:
stdenv.mkDerivation {
name = "okular-${version}";
inherit src;
name = "okular";
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
buildInputs = [
kdelibs qimageblitz poppler_qt4 libspectre libkexiv2 djvulibre libtiff

View file

@ -1,20 +1,8 @@
{ kdeApp
, lib
, extra-cmake-modules
, qtdeclarative
, cups
, kconfig
, kconfigwidgets
, kdbusaddons
, kiconthemes
, ki18n
, kcmutils
, kio
, knotifications
, plasma-framework
, kwidgetsaddons
, kwindowsystem
, kitemviews
{
kdeApp, lib, ecm,
cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
qtdeclarative
}:
kdeApp {
@ -23,9 +11,7 @@ kdeApp {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [
cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework

View file

@ -1,20 +1,7 @@
{ kdeApp, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, kconfig
, kcoreaddons
, kdbusaddons
, kdeclarative
, ki18n
, kio
, knotifications
, kscreen
, kwidgetsaddons
, kwindowsystem
, kxmlgui
, libkipi
, xcb-util-cursor
{
kdeApp, lib, ecm, kdoctools, makeQtWrapper,
kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications,
kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor
}:
kdeApp {
@ -22,9 +9,7 @@ kdeApp {
meta = with lib; {
maintainers = with maintainers; [ ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules kdoctools makeQtWrapper
];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
propagatedBuildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor

View file

@ -22,10 +22,6 @@ let
kdeDerivation = args:
let
setupHook =
let drv = { qtbase, qttools }:
makeSetupHook { deps = [ qtbase qttools ]; } ./setup-hook.sh;
in callPackage drv {};
in stdenv.mkDerivation (args // {
outputs = args.outputs or [ "dev" "out" ];
@ -37,7 +33,7 @@ let
nativeBuildInputs =
(args.nativeBuildInputs or [])
++ [ pkgs.cmake pkgs.pkgconfig setupHook ];
++ [ pkgs.cmake pkgs.pkgconfig ecm ];
});
@ -62,6 +58,12 @@ let
baloo = callPackage ./baloo.nix {};
bluez-qt = callPackage ./bluez-qt.nix {};
breeze-icons = callPackage ./breeze-icons.nix {};
ecm =
let drv = { qtbase, qttools }:
makeSetupHook
{ deps = [ extra-cmake-modules qtbase qttools ]; }
./setup-hook.sh;
in callPackage drv {};
extra-cmake-modules = callPackage ./extra-cmake-modules {
inherit (srcs.extra-cmake-modules) src version;
};