propagate kdeclarative dependencies

This commit is contained in:
Thomas Tuegel 2015-10-10 10:06:36 -05:00
parent d013d746b6
commit c21da82680
11 changed files with 49 additions and 179 deletions

View file

@ -1,24 +1,7 @@
{ plasmaPackage { plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
, extra-cmake-modules , kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
, kdoctools , kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
, kcmutils , kservice, kwidgetsaddons, kxmlgui, libraw1394, pciutils, solid
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdeclarative
, kdelibs4support
, ki18n
, kiconthemes
, kio
, kpackage
, kservice
, kwidgetsaddons
, kxmlgui
, libraw1394
, pciutils
, solid
}: }:
plasmaPackage { plasmaPackage {
@ -28,25 +11,11 @@ plasmaPackage {
kdoctools kdoctools
]; ];
buildInputs = [ buildInputs = [
kcmutils kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
kcompletion kdbusaddons kdelibs4support ki18n kiconthemes kio kpackage
kconfig kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid
kconfigwidgets
kcoreaddons
kdbusaddons
kdeclarative
kdelibs4support
ki18n
kiconthemes
kio
kpackage
kservice
kwidgetsaddons
kxmlgui
libraw1394
pciutils
solid
]; ];
propagatedBuildInputs = [ kdeclarative ];
postInstall = '' postInstall = ''
wrapKDEProgram "$out/bin/kinfocenter" wrapKDEProgram "$out/bin/kinfocenter"
''; '';

View file

@ -15,13 +15,13 @@ plasmaPackage {
]; ];
buildInputs = [ buildInputs = [
epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kcrash kdecoration kglobalaccel ki18n kiconthemes
kinit kio knewstuff knotifications kpackage kservice kwayland kinit kio knewstuff knotifications kpackage kservice kwayland
kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM
plasma-framework qtdeclarative qtscript qtx11extras udev wayland plasma-framework qtdeclarative qtscript qtx11extras udev wayland
xcb-util-cursor xcb-util-cursor
]; ];
propagatedBuildInputs = [ kactivities ]; propagatedBuildInputs = [ kactivities kdeclarative ];
patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ];
postInstall = '' postInstall = ''
wrapKDEProgram "$out/bin/kwin_x11" wrapKDEProgram "$out/bin/kwin_x11"

View file

@ -1,12 +1,5 @@
{ plasmaPackage { plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
, extra-cmake-modules , kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
, qtscript
, qtdeclarative
, kcoreaddons
, ki18n
, kdeclarative
, kservice
, plasma-framework
, krunner , krunner
}: }:
@ -16,13 +9,7 @@ plasmaPackage {
extra-cmake-modules extra-cmake-modules
]; ];
buildInputs = [ buildInputs = [
qtscript qtscript kcoreaddons ki18n kservice plasma-framework krunner
qtdeclarative
kcoreaddons
ki18n
kdeclarative
kservice
plasma-framework
krunner
]; ];
propagatedBuildInputs = [ kdeclarative qtdeclarative ];
} }

View file

@ -17,14 +17,14 @@ plasmaPackage {
]; ];
buildInputs = [ buildInputs = [
attica boost fontconfig kcmutils attica boost fontconfig kcmutils
kdbusaddons kdeclarative kded kdelibs4support kemoticons kdbusaddons kded kdelibs4support kemoticons
kglobalaccel ki18n kitemmodels knewstuff knotifications kglobalaccel ki18n kitemmodels knewstuff knotifications
knotifyconfig kpeople krunner kwallet kwin libcanberra_kde knotifyconfig kpeople krunner kwallet kwin libcanberra_kde
libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework
plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev
xf86inputsynaptics xkeyboard_config xinput xf86inputsynaptics xkeyboard_config xinput
]; ];
propagatedBuildInputs = [ baloo kactivities kauth ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative ];
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./0001-hwclock.patch; src = ./0001-hwclock.patch;

View file

@ -10,9 +10,9 @@ plasmaPackage {
extra-cmake-modules extra-cmake-modules
]; ];
buildInputs = [ buildInputs = [
kconfig kcoreaddons kdeclarative kguiaddons ki18n kio kconfig kcoreaddons kguiaddons ki18n kio
kservice kfilemetadata plasma-framework qtdeclarative qtmultimedia kservice kfilemetadata plasma-framework qtdeclarative qtmultimedia
taglib taglib
]; ];
propagatedBuildInputs = [ baloo kactivities ]; propagatedBuildInputs = [ baloo kactivities kdeclarative ];
} }

View file

@ -1,29 +1,9 @@
{ plasmaPackage { plasmaPackage, extra-cmake-modules, kdoctools, kcompletion
, extra-cmake-modules , kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdoctools , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
, kcompletion , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
, kconfigwidgets , kxmlgui, mobile_broadband_provider_info, modemmanager-qt
, kcoreaddons , networkmanager-qt, openconnect, plasma-framework, qtdeclarative
, kdbusaddons
, kdeclarative
, kdelibs4support
, ki18n
, kiconthemes
, kinit
, kio
, kitemviews
, knotifications
, kservice
, kwallet
, kwidgetsaddons
, kwindowsystem
, kxmlgui
, mobile_broadband_provider_info
, modemmanager-qt
, networkmanager-qt
, openconnect
, plasma-framework
, qtdeclarative
, solid , solid
}: }:
@ -34,31 +14,13 @@ plasmaPackage {
kdoctools kdoctools
]; ];
buildInputs = [ buildInputs = [
kcompletion kcompletion kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
kconfigwidgets ki18n kiconthemes kinit kio kitemviews knotifications kservice
kcoreaddons kwallet kwidgetsaddons kwindowsystem kxmlgui
kdbusaddons mobile_broadband_provider_info modemmanager-qt networkmanager-qt
kdeclarative openconnect plasma-framework qtdeclarative solid
kdelibs4support
ki18n
kiconthemes
kinit
kio
kitemviews
knotifications
kservice
kwallet
kwidgetsaddons
kwindowsystem
kxmlgui
mobile_broadband_provider_info
modemmanager-qt
networkmanager-qt
openconnect
plasma-framework
qtdeclarative
solid
]; ];
propagatedBuildInputs = [ kdeclarative ];
postInstall = '' postInstall = ''
wrapKDEProgram "$out/bin/kde5-nm-connection-editor" wrapKDEProgram "$out/bin/kde5-nm-connection-editor"
''; '';

View file

@ -1,12 +1,5 @@
{ plasmaPackage { plasmaPackage, extra-cmake-modules, glib, kconfigwidgets
, extra-cmake-modules , kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
, glib
, kconfigwidgets
, kcoreaddons
, kdeclarative
, kglobalaccel
, ki18n
, libpulseaudio
, plasma-framework , plasma-framework
}: }:
@ -16,13 +9,8 @@ plasmaPackage {
extra-cmake-modules extra-cmake-modules
]; ];
buildInputs = [ buildInputs = [
glib glib kconfigwidgets kcoreaddons kglobalaccel ki18n libpulseaudio
kconfigwidgets
kcoreaddons
kdeclarative
kglobalaccel
ki18n
libpulseaudio
plasma-framework plasma-framework
]; ];
propagatedBuildInputs = [ kdeclarative ];
} }

View file

@ -17,7 +17,7 @@ plasmaPackage {
kdoctools kdoctools
]; ];
buildInputs = [ buildInputs = [
kcmutils kcrash kdbusaddons kdeclarative kcmutils kcrash kdbusaddons
kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed
knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets
kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM
@ -25,7 +25,7 @@ plasmaPackage {
qtscript qtx11extras solid wayland qtscript qtx11extras solid wayland
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
baloo kactivities libksysguard baloo kactivities kdeclarative libksysguard
]; ];
patches = [ ./0001-startkde-NixOS-patches.patch ]; patches = [ ./0001-startkde-NixOS-patches.patch ];

View file

@ -1,38 +1,16 @@
{ kdeFramework, lib { kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
, extra-cmake-modules , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
, boost , kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
, kcmutils
, kconfig
, kcoreaddons
, kdbusaddons
, kdeclarative
, kglobalaccel
, ki18n
, kio
, kservice
, kwindowsystem
, kxmlgui
, qtdeclarative
}: }:
kdeFramework { kdeFramework {
name = "kactivities"; name = "kactivities";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
boost boost kcmutils kconfig kcoreaddons kdbusaddons kglobalaccel ki18n
kcmutils kio kservice kwindowsystem kxmlgui
kconfig
kcoreaddons
kdbusaddons
kdeclarative
kglobalaccel
ki18n
kio
kservice
kwindowsystem
kxmlgui
qtdeclarative
]; ];
propagatedBuildInputs = [ kdeclarative qtdeclarative ];
postInstall = '' postInstall = ''
wrapKDEProgram "$out/bin/kactivitymanagerd" wrapKDEProgram "$out/bin/kactivitymanagerd"
''; '';

View file

@ -1,29 +1,15 @@
{ kdeFramework, lib { kdeFramework, lib, extra-cmake-modules, kconfigwidgets
, extra-cmake-modules , kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
, kconfigwidgets , kpackage, kservice, kxmlgui
, kcoreaddons
, kdeclarative
, ki18n
, kiconthemes
, kitemviews
, kpackage
, kservice
, kxmlgui
}: }:
kdeFramework { kdeFramework {
name = "kcmutils"; name = "kcmutils";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
kcoreaddons kcoreaddons ki18n kiconthemes kitemviews kpackage kxmlgui
kdeclarative
ki18n
kiconthemes
kitemviews
kpackage
kxmlgui
]; ];
propagatedBuildInputs = [ kconfigwidgets kservice ]; propagatedBuildInputs = [ kconfigwidgets kdeclarative kservice ];
patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ]; patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ];
meta = { meta = {
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -10,10 +10,10 @@ kdeFramework {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
karchive kconfig kconfigwidgets kcoreaddons karchive kconfig kconfigwidgets kcoreaddons
kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kdbusaddons kglobalaccel kguiaddons ki18n kiconthemes
kio knotifications kwindowsystem kxmlgui qtscript qtx11extras kio knotifications kwindowsystem kxmlgui qtscript qtx11extras
]; ];
propagatedBuildInputs = [ kactivities kpackage kservice ]; propagatedBuildInputs = [ kactivities kdeclarative kpackage kservice ];
postInstall = '' postInstall = ''
wrapKDEProgram "$out/bin/plasmapkg2" wrapKDEProgram "$out/bin/plasmapkg2"
''; '';