Merge branch 'plasma'

This commit is contained in:
Thomas Tuegel 2016-11-05 14:48:19 -05:00
commit 93fc7c35ef
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
6 changed files with 48 additions and 37 deletions

View File

@ -1,11 +1,14 @@
{ plasmaPackage, ecm, kdoctools, ki18n, kxmlgui
, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support
{
plasmaPackage,
ecm, kdoctools,
kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui,
sonnet
}:
plasmaPackage {
name = "kmenuedit";
nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [
kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes
kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet
];
}

View File

@ -1,11 +1,15 @@
{ plasmaPackage, ecm, kdoctools, kconfig
, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
, kiconthemes, libksysguard, qtwebkit
{
plasmaPackage,
ecm, kdoctools,
lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
knewstuff, libksysguard, lm_sensors, qtwebkit
}:
plasmaPackage {
name = "ksysguard";
nativeBuildInputs = [ ecm kdoctools ];
buildInputs = [ lm_sensors ];
propagatedBuildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
kdelibs4support ki18n qtwebkit

View File

@ -1,7 +1,9 @@
{ fetchpatch, plasmaPackage, ecm, kauth, kcompletion
, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons
, kwindowsystem, plasma-framework, qtscript, qtx11extras
, kconfig, ki18n, kiconthemes
{
plasmaPackage,
ecm,
kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
qtx11extras
}:
plasmaPackage {
@ -9,11 +11,10 @@ plasmaPackage {
patches = [
./0001-qdiriterator-follow-symlinks.patch
];
nativeBuildInputs = [
ecm
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [
kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras
kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons qtscript
kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
qtwebkit
];
}

View File

@ -1,16 +1,16 @@
{ plasmaPackage, ecm, ki18n, kcmutils, kconfig
, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion
, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras
{
plasmaPackage,
ecm, makeQtWrapper,
frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
}:
plasmaPackage {
name = "oxygen";
nativeBuildInputs = [
ecm makeQtWrapper
];
nativeBuildInputs = [ ecm makeQtWrapper ];
propagatedBuildInputs = [
kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion
frameworkintegration ki18n kwindowsystem qtx11extras
frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
];
postInstall = ''
wrapQtProgram "$out/bin/oxygen-demo5"

View File

@ -1,20 +1,20 @@
{ plasmaPackage, substituteAll, ecm, kdoctools
, attica, baloo, boost, fontconfig, kactivities, kactivities-stats
, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications
, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
, libcanberra_kde, libpulseaudio, utillinux
, qtquickcontrols, ksysguard
{
plasmaPackage, substituteAll,
ecm, kdoctools,
attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft,
libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework,
plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, xf86inputevdev,
xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, utillinux
}:
plasmaPackage rec {
name = "plasma-desktop";
nativeBuildInputs = [ ecm kdoctools ];
buildInputs = [
attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff
attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff
knotifications knotifyconfig kwallet libcanberra_kde libXcursor
libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
xf86inputsynaptics xkeyboard_config xinput baloo kactivities

View File

@ -1,11 +1,14 @@
{ kdeFramework, lib
, ecm
, ilmbase
{
kdeFramework, lib,
ecm,
ilmbase, karchive
}:
kdeFramework {
name = "kimageformats";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ ecm ];
buildInputs = [ ilmbase ];
propagatedBuildInputs = [ karchive ];
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
}