Merge pull request #17402 from ttuegel/plasma-closure-size

Plasma closure size
This commit is contained in:
Thomas Tuegel 2016-07-31 10:29:07 -05:00 committed by GitHub
commit ac98cc4d94
33 changed files with 370 additions and 392 deletions

View File

@ -1,7 +1,7 @@
{ {
kdeApp, lib, kdeApp, lib, kdeWrapper,
ecm, kdoctools, makeQtWrapper, ecm, kdoctools, makeWrapper,
karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio, karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
kservice, kpty, kwidgetsaddons, libarchive, kservice, kpty, kwidgetsaddons, libarchive,
@ -10,26 +10,33 @@
p7zip, unrar, unzipNLS, zip p7zip, unrar, unzipNLS, zip
}: }:
kdeApp { let
name = "ark"; unwrapped =
nativeBuildInputs = [ kdeApp {
ecm kdoctools makeQtWrapper name = "ark";
]; nativeBuildInputs = [
propagatedBuildInputs = [ ecm kdoctools makeWrapper
khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
kpty kwidgetsaddons libarchive
];
postInstall =
let
PATH = lib.makeBinPath [
p7zip unrar unzipNLS zip
]; ];
in '' propagatedBuildInputs = [
wrapQtProgram "$out/bin/ark" \ khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
--prefix PATH : "${PATH}" kpty kwidgetsaddons libarchive
''; ];
meta = { postInstall =
license = with lib.licenses; [ gpl2 lgpl3 ]; let
maintainers = [ lib.maintainers.ttuegel ]; PATH = lib.makeBinPath [
}; p7zip unrar unzipNLS zip
];
in ''
wrapProgram "$out/bin/ark" \
--prefix PATH : "${PATH}"
'';
meta = {
license = with lib.licenses; [ gpl2 lgpl3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
};
in
kdeWrapper unwrapped
{
targets = [ "bin/ark" ];
} }

View File

@ -11,5 +11,7 @@ kdeApp {
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [ dolphin kdelibs4support ki18n kio kxmlgui ]; propagatedBuildInputs = [
dolphin.unwrapped kdelibs4support ki18n kio kxmlgui
];
} }

View File

@ -1,26 +1,31 @@
{ {
kdeApp, lib, kdeApp, lib, kdeWrapper,
ecm, kdoctools, makeQtWrapper, ecm, kdoctools, makeQtWrapper,
baloo, baloo-widgets, kactivities, kbookmarks, kcmutils, kcompletion, kconfig, baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
kcoreaddons, kdelibs4support, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
kinit, kio, knewstuff, knotifications, kparts, ktexteditor, kwindowsystem, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
phonon, solid kparts, ktexteditor, kwindowsystem, phonon, solid
}: }:
kdeApp { let
name = "dolphin"; unwrapped =
meta = { kdeApp {
license = with lib.licenses; [ gpl2 fdl12 ]; name = "dolphin";
maintainers = [ lib.maintainers.ttuegel ]; meta = {
}; license = with lib.licenses; [ gpl2 fdl12 ];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; maintainers = [ lib.maintainers.ttuegel ];
propagatedBuildInputs = [ };
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes propagatedBuildInputs = [
kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem phonon baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
solid kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
]; kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
postInstall = '' phonon solid
wrapQtProgram "$out/bin/dolphin" ];
''; };
in
kdeWrapper unwrapped
{
targets = [ "bin/dolphin" ];
paths = [ dolphin-plugins ];
} }

View File

@ -1,20 +1,21 @@
{ {
kdeApp, lib, kdeApp, lib, kdeWrapper,
ecm, kdoctools, makeQtWrapper, ecm, kdoctools,
kio, kparts, kxmlgui, qtscript, solid kio, kparts, kxmlgui, qtscript, solid
}: }:
kdeApp { let
name = "filelight"; unwrapped =
meta = { kdeApp {
license = with lib.licenses; [ gpl2 ]; name = "filelight";
maintainers = with lib.maintainers; [ fridh vcunat ]; meta = {
}; license = with lib.licenses; [ gpl2 ];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; maintainers = with lib.maintainers; [ fridh vcunat ];
propagatedBuildInputs = [ };
kio kparts kxmlgui qtscript solid nativeBuildInputs = [ ecm kdoctools ];
]; propagatedBuildInputs = [
postInstall = '' kio kparts kxmlgui qtscript solid
wrapQtProgram "$out/bin/filelight" ];
''; };
} in
kdeWrapper unwrapped { targets = [ "bin/filelight" ]; }

View File

@ -1,21 +1,23 @@
{ {
kdeApp, lib, kdeApp, lib, kdeWrapper,
ecm, kdoctools, makeQtWrapper, ecm, kdoctools,
baloo, exiv2, kactivities, kdelibs4support, kio, lcms2, phonon, baloo, exiv2, kactivities, kdelibs4support, kio, lcms2, phonon,
qtsvg, qtx11extras qtsvg, qtx11extras
}: }:
kdeApp { let
name = "gwenview"; unwrapped =
meta = { kdeApp {
license = with lib.licenses; [ gpl2 fdl12 ]; name = "gwenview";
maintainers = [ lib.maintainers.ttuegel ]; meta = {
}; license = with lib.licenses; [ gpl2 fdl12 ];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; maintainers = [ lib.maintainers.ttuegel ];
propagatedBuildInputs = [ };
baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon qtsvg nativeBuildInputs = [ ecm kdoctools ];
]; propagatedBuildInputs = [
postInstall = '' baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon
wrapQtProgram "$out/bin/gwenview" qtsvg
''; ];
} };
in
kdeWrapper unwrapped { targets = [ "bin/gwenview" ]; }

View File

@ -1,26 +1,27 @@
{ {
kdeApp, lib, makeQtWrapper, ecm, kdoctools, kdeApp, lib, kdeWrapper,
ecm, kdoctools,
kactivities, kconfig, kcrash, kguiaddons, kiconthemes, ki18n, kinit, kactivities, kconfig, kcrash, kguiaddons, kiconthemes, ki18n, kinit,
kjobwidgets, kio, kparts, ktexteditor, kwindowsystem, kxmlgui, kdbusaddons, kjobwidgets, kio, kparts, ktexteditor, kwindowsystem, kxmlgui, kdbusaddons,
kwallet, plasma-framework, kitemmodels, knotifications, qtscript, kwallet, plasma-framework, kitemmodels, knotifications, qtscript,
threadweaver, knewstuff, libgit2 threadweaver, knewstuff, libgit2
}: }:
kdeApp { let
name = "kate"; unwrapped =
meta = { kdeApp {
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; name = "kate";
maintainers = [ lib.maintainers.ttuegel ]; meta = {
}; license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; maintainers = [ lib.maintainers.ttuegel ];
propagatedBuildInputs = [ };
kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript nativeBuildInputs = [ ecm kdoctools ];
kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui propagatedBuildInputs = [
kdbusaddons kwallet kitemmodels knotifications threadweaver knewstuff kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
libgit2 qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
]; kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
postInstall = '' knewstuff libgit2
wrapQtProgram "$out/bin/kate" ];
wrapQtProgram "$out/bin/kwrite" };
''; in
} kdeWrapper unwrapped { targets = [ "bin/kate" "bin/kwrite" ]; }

View File

@ -1,20 +1,21 @@
{ {
kdeApp, lib, makeQtWrapper, kdoctools, kdeApp, lib, kdeWrapper,
ecm, kconfig, kconfigwidgets, kguiaddons, kinit, ecm, kdoctools,
knotifications, gmp kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
}: }:
kdeApp { let
name = "kcalc"; unwrapped =
meta = { kdeApp {
license = with lib.licenses; [ gpl2 ]; name = "kcalc";
maintainers = [ lib.maintainers.fridh ]; meta = {
}; license = with lib.licenses; [ gpl2 ];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; maintainers = [ lib.maintainers.fridh ];
propagatedBuildInputs = [ };
gmp kconfig kconfigwidgets kguiaddons kinit knotifications nativeBuildInputs = [ ecm kdoctools ];
]; propagatedBuildInputs = [
postInstall = '' gmp kconfig kconfigwidgets kguiaddons kinit knotifications
wrapQtProgram "$out/bin/kcalc" ];
''; };
} in
kdeWrapper unwrapped { targets = [ "bin/kcalc" ]; }

View File

@ -1,14 +1,18 @@
{ {
kdeApp, lib, kdeApp, lib, kdeWrapper,
ecm, ki18n, kwidgetsaddons, kxmlgui ecm, ki18n, kwidgetsaddons, kxmlgui
}: }:
kdeApp { let
name = "kcolorchooser"; unwrapped =
meta = { kdeApp {
license = with lib.licenses; [ mit ]; name = "kcolorchooser";
maintainers = [ lib.maintainers.ttuegel ]; meta = {
}; license = with lib.licenses; [ mit ];
nativeBuildInputs = [ ecm ]; maintainers = [ lib.maintainers.ttuegel ];
propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ]; };
} nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
};
in
kdeWrapper unwrapped { targets = [ "bin/kcolorchooser" ]; }

View File

@ -1,17 +1,19 @@
{ {
kdeApp, ecm, kdoctools, makeQtWrapper, kdeApp, kdeWrapper,
ecm, kdoctools,
grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
kdelibs4support, khtml, kservice, xapian kdelibs4support, khtml, kservice, xapian
}: }:
kdeApp { let
name = "khelpcenter"; unwrapped =
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; kdeApp {
buildInputs = [ name = "khelpcenter";
grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit nativeBuildInputs = [ ecm kdoctools ];
kcmutils kservice xapian buildInputs = [
]; grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
postInstall = '' kinit kcmutils kservice xapian
wrapQtProgram "$out/bin/khelpcenter" ];
''; };
} in
kdeWrapper unwrapped { targets = [ "bin/khelpcenter" ]; }

View File

@ -1,19 +1,18 @@
{ {
kdeApp, lib, ecm, kdoctools, makeQtWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools,
kparts, ktexteditor, kwidgetsaddons, libkomparediff2 kparts, ktexteditor, kwidgetsaddons, libkomparediff2
}: }:
kdeApp { let
name = "kompare"; unwrapped =
meta = { kdeApp {
license = with lib.licenses; [ gpl2 ]; name = "kompare";
}; meta = { license = with lib.licenses; [ gpl2 ]; };
nativeBuildInputs = [ ecm kdoctools ];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; propagatedBuildInputs = [
kparts ktexteditor kwidgetsaddons libkomparediff2
propagatedBuildInputs = [ kparts ktexteditor kwidgetsaddons libkomparediff2 ]; ];
};
postInstall = '' in
wrapQtProgram "$out/bin/kompare" kdeWrapper unwrapped { targets = [ "bin/kompare" ]; }
'';
}

View File

@ -1,25 +1,27 @@
{ {
kdeApp, lib, kdeApp, lib, kdeWrapper,
ecm, kdoctools, makeQtWrapper, ecm, kdoctools,
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
kwindowsystem, kxmlgui, qtscript kwindowsystem, kxmlgui, qtscript
}: }:
kdeApp { let
name = "konsole"; unwrapped =
meta = { kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; name = "konsole";
maintainers = [ lib.maintainers.ttuegel ]; meta = {
}; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; maintainers = [ lib.maintainers.ttuegel ];
propagatedBuildInputs = [ };
kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kconfig nativeBuildInputs = [ ecm kdoctools ];
kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio knotifications propagatedBuildInputs = [
knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kxmlgui kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
]; kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
postInstall = '' knotifications knotifyconfig kparts kpty kservice ktextwidgets
wrapQtProgram "$out/bin/konsole" kwidgetsaddons kxmlgui
''; ];
} };
in
kdeWrapper unwrapped { targets = [ "bin/konsole" ]; }

View File

@ -1,20 +1,20 @@
{ {
kdeApp, lib, ecm, kdoctools, makeQtWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools,
kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications, kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications,
kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor
}: }:
kdeApp { let
name = "spectacle"; unwrapped =
meta = with lib; { kdeApp {
maintainers = with maintainers; [ ttuegel ]; name = "spectacle";
}; meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
]; ];
postInstall = '' };
wrapQtProgram "$out/bin/spectacle" in
''; kdeWrapper unwrapped { targets = [ "bin/spectacle" ]; }
}

View File

@ -1,22 +1,18 @@
{ plasmaPackage, ecm, bluez-qt, kcoreaddons {
, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications plasmaPackage, ecm, shared_mime_info,
, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
, qtdeclarative, shared_mime_info knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
}: }:
plasmaPackage { plasmaPackage {
name = "bluedevil"; name = "bluedevil";
nativeBuildInputs = [ nativeBuildInputs = [ ecm shared_mime_info ];
ecm makeQtWrapper shared_mime_info
];
propagatedBuildInputs = [ propagatedBuildInputs = [
bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
kdbusaddons kded kiconthemes knotifications kwidgetsaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons
]; ];
propagatedUserEnvPkgs = [ bluez-qt ]; propagatedUserEnvPkgs = [ bluez-qt.out ];
postInstall = '' postInstall = ''
wrapQtProgram "$out/bin/bluedevil-wizard"
wrapQtProgram "$out/bin/bluedevil-sendfile"
# Fix the location of logic.js for the plasmoid # Fix the location of logic.js for the plasmoid
ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
''; '';

View File

@ -1,25 +1,14 @@
{ plasmaPackage, ecm, kcmutils, kconfig {
, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes plasmaPackage, ecm,
, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
kwindowsystem, qtsvg, qtx11extras
}: }:
plasmaPackage { plasmaPackage {
name = "kde-cli-tools"; name = "kde-cli-tools";
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kdelibs4support ki18n kwindowsystem qtsvg qtx11extras kcmutils kconfig kdesu kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg
kiconthemes qtx11extras
]; ];
postInstall = ''
wrapQtProgram "$out/bin/kmimetypefinder5"
wrapQtProgram "$out/bin/ksvgtopng5"
wrapQtProgram "$out/bin/ktraderclient5"
wrapQtProgram "$out/bin/kioclient5"
wrapQtProgram "$out/bin/kdecp5"
wrapQtProgram "$out/bin/keditfiletype5"
wrapQtProgram "$out/bin/kcmshell5"
wrapQtProgram "$out/bin/kdemv5"
wrapQtProgram "$out/bin/kstart5"
wrapQtProgram "$out/bin/kde-open5"
'';
} }

View File

@ -1,23 +1,16 @@
{ plasmaPackage, ecm, kdoctools, kcmutils { plasmaPackage, ecm, kdoctools, kcmutils
, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons , kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage , kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper , kservice, kwidgetsaddons, kxmlgui, libraw1394
, pciutils, solid , pciutils, solid
}: }:
plasmaPackage { plasmaPackage {
name = "kinfocenter"; name = "kinfocenter";
nativeBuildInputs = [ nativeBuildInputs = [ ecm kdoctools ];
ecm
kdoctools
makeQtWrapper
];
propagatedBuildInputs = [ propagatedBuildInputs = [
kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig
kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice
kwidgetsaddons kxmlgui libraw1394 pciutils solid kwidgetsaddons kxmlgui libraw1394 pciutils solid
]; ];
postInstall = ''
wrapQtProgram "$out/bin/kinfocenter"
'';
} }

View File

@ -1,18 +1,11 @@
{ plasmaPackage, ecm, kdoctools, ki18n, kxmlgui { plasmaPackage, ecm, kdoctools, ki18n, kxmlgui
, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper , kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support
}: }:
plasmaPackage { plasmaPackage {
name = "kmenuedit"; name = "kmenuedit";
nativeBuildInputs = [ nativeBuildInputs = [ ecm kdoctools ];
ecm
kdoctools
makeQtWrapper
];
propagatedBuildInputs = [ propagatedBuildInputs = [
kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes
]; ];
postInstall = ''
wrapQtProgram "$out/bin/kmenuedit"
'';
} }

View File

@ -1,19 +1,13 @@
{ plasmaPackage, ecm, kconfig, kconfigwidgets { plasmaPackage, ecm, kconfig, kconfigwidgets
, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
, libkscreen, makeQtWrapper, qtdeclarative, qtgraphicaleffects , libkscreen, qtdeclarative, qtgraphicaleffects
}: }:
plasmaPackage { plasmaPackage {
name = "kscreen"; name = "kscreen";
nativeBuildInputs = [ nativeBuildInputs = [ ecm ];
ecm
makeQtWrapper
];
propagatedBuildInputs = [ propagatedBuildInputs = [
kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
]; ];
postInstall = ''
wrapQtProgram "$out/bin/kscreen-console"
'';
} }

View File

@ -5,10 +5,7 @@
plasmaPackage { plasmaPackage {
name = "kscreenlocker"; name = "kscreenlocker";
nativeBuildInputs = [ nativeBuildInputs = [ ecm kdoctools ];
ecm
kdoctools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support
kglobalaccel kidletime kwayland libXcursor pam wayland kglobalaccel kidletime kwayland libXcursor pam wayland

View File

@ -1,12 +1,9 @@
{ plasmaPackage, ecm, kdoctools, kcoreaddons { plasmaPackage, ecm, kdoctools, kcoreaddons
, ki18n, kwallet, kwidgetsaddons, makeQtWrapper , ki18n, kwallet, kwidgetsaddons
}: }:
plasmaPackage { plasmaPackage {
name = "ksshaskpass"; name = "ksshaskpass";
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ]; propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
postInstall = ''
wrapQtProgram "$out/bin/ksshaskpass"
'';
} }

View File

@ -1,20 +1,13 @@
{ plasmaPackage, ecm, kdoctools, kconfig { plasmaPackage, ecm, kdoctools, kconfig
, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff , kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
, kiconthemes, libksysguard, makeQtWrapper , kiconthemes, libksysguard
}: }:
plasmaPackage { plasmaPackage {
name = "ksysguard"; name = "ksysguard";
nativeBuildInputs = [ nativeBuildInputs = [ ecm kdoctools ];
ecm
kdoctools
makeQtWrapper
];
propagatedBuildInputs = [ propagatedBuildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
kdelibs4support ki18n kdelibs4support ki18n
]; ];
postInstall = ''
wrapQtProgram "$out/bin/ksysguardd"
'';
} }

View File

@ -13,7 +13,6 @@ plasmaPackage {
nativeBuildInputs = [ nativeBuildInputs = [
ecm ecm
kdoctools kdoctools
makeQtWrapper
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem
@ -25,8 +24,4 @@ plasmaPackage {
]; ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
postInstall = ''
wrapQtProgram "$out/bin/kwin_x11"
wrapQtProgram "$out/bin/kwin_wayland"
'';
} }

View File

@ -6,17 +6,13 @@
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux , libcanberra_kde, libpulseaudio, utillinux
, qtquickcontrols, ksysguard , qtquickcontrols, ksysguard
}: }:
plasmaPackage rec { plasmaPackage rec {
name = "plasma-desktop"; name = "plasma-desktop";
nativeBuildInputs = [ nativeBuildInputs = [ ecm kdoctools ];
ecm
kdoctools
makeQtWrapper
];
buildInputs = [ buildInputs = [
attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff
knotifications knotifyconfig kwallet libcanberra_kde libXcursor knotifications knotifyconfig kwallet libcanberra_kde libXcursor
@ -42,14 +38,4 @@ plasmaPackage rec {
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
]; ];
postInstall = ''
wrapQtProgram "$out/bin/kaccess"
wrapQtProgram "$out/bin/solid-action-desktop-gen"
wrapQtProgram "$out/bin/knetattach"
wrapQtProgram "$out/bin/krdb"
wrapQtProgram "$out/bin/kapplymousetheme"
wrapQtProgram "$out/bin/kfontinst"
wrapQtProgram "$out/bin/kcm-touchpad-list-devices"
wrapQtProgram "$out/bin/kfontview"
'';
} }

View File

@ -2,7 +2,7 @@
, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
, kxmlgui, makeQtWrapper, mobile_broadband_provider_info , kxmlgui, mobile_broadband_provider_info
, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework , modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
, qca-qt5, qtdeclarative, solid , qca-qt5, qtdeclarative, solid
}: }:
@ -15,11 +15,7 @@ plasmaPackage {
inherit mobile_broadband_provider_info; inherit mobile_broadband_provider_info;
}) })
]; ];
nativeBuildInputs = [ nativeBuildInputs = [ ecm kdoctools ];
ecm
kdoctools
makeQtWrapper
];
propagatedBuildInputs = [ propagatedBuildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
@ -27,7 +23,4 @@ plasmaPackage {
mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
qca-qt5 solid qca-qt5 solid
]; ];
postInstall = ''
wrapQtProgram "$out/bin/kde5-nm-connection-editor"
'';
} }

View File

@ -4,6 +4,7 @@
plasmaPackage { plasmaPackage {
name = "plasma-workspace-wallpapers"; name = "plasma-workspace-wallpapers";
outputs = [ "out" ];
nativeBuildInputs = [ nativeBuildInputs = [
ecm ecm
]; ];

View File

@ -14,9 +14,7 @@
plasmaPackage { plasmaPackage {
name = "plasma-workspace"; name = "plasma-workspace";
nativeBuildInputs = [ nativeBuildInputs = [ ecm kdoctools ];
ecm kdoctools
];
buildInputs = [ buildInputs = [
baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff

View File

@ -1,22 +1,12 @@
{ plasmaPackage {
, ecm plasmaPackage, ecm,
, ki18n kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
, kwindowsystem kwidgetsaddons, kwindowsystem, polkit-qt
, kdbusaddons
, kwidgetsaddons
, kcoreaddons
, kcrash
, kconfig
, kiconthemes
, knotifications
, polkit-qt
}: }:
plasmaPackage { plasmaPackage {
name = "polkit-kde-agent"; name = "polkit-kde-agent";
nativeBuildInputs = [ nativeBuildInputs = [ ecm ];
ecm
];
propagatedBuildInputs = [ propagatedBuildInputs = [
kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
knotifications kwindowsystem polkit-qt knotifications kwindowsystem polkit-qt

View File

@ -6,10 +6,7 @@
plasmaPackage { plasmaPackage {
name = "powerdevil"; name = "powerdevil";
nativeBuildInputs = [ nativeBuildInputs = [ ecm kdoctools ];
ecm
kdoctools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen

View File

@ -11,7 +11,4 @@ plasmaPackage {
kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
kwindowsystem kxmlgui qtquickcontrols kwindowsystem kxmlgui qtquickcontrols
]; ];
postInstall = ''
wrapQtProgram "$out/bin/systemsettings5"
'';
} }

View File

@ -5,6 +5,6 @@ kdeFramework {
meta = { maintainers = [ lib.maintainers.ttuegel ]; }; meta = { maintainers = [ lib.maintainers.ttuegel ]; };
outputs = [ "out" ]; outputs = [ "out" ];
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ qtsvg ]; buildInputs = [ qtsvg ];
propagatedUserEnvPkgs = [ qtsvg.out ]; propagatedUserEnvPkgs = [ qtsvg.out ];
} }

View File

@ -26,6 +26,9 @@ let
outputs = args.outputs or [ "dev" "out" ]; outputs = args.outputs or [ "dev" "out" ];
propagatedUserEnvPkgs =
builtins.map lib.getBin (args.propagatedBuildInputs or []);
cmakeFlags = cmakeFlags =
(args.cmakeFlags or []) (args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ] ++ [ "-DBUILD_TESTING=OFF" ]
@ -50,6 +53,16 @@ let
} // (args.meta or {}); } // (args.meta or {});
}); });
kdeEnv = import ./kde-env.nix {
inherit (pkgs) stdenv lib;
inherit (pkgs.xorg) lndir;
};
kdeWrapper = import ./kde-wrapper.nix {
inherit (pkgs) stdenv lib makeWrapper;
inherit kdeEnv;
};
attica = callPackage ./attica.nix {}; attica = callPackage ./attica.nix {};
baloo = callPackage ./baloo.nix {}; baloo = callPackage ./baloo.nix {};
bluez-qt = callPackage ./bluez-qt.nix {}; bluez-qt = callPackage ./bluez-qt.nix {};

View File

@ -0,0 +1,31 @@
{ stdenv, lib, lndir }:
drv: pkgs:
stdenv.mkDerivation {
name = "kde-env-${drv.name}";
nativeBuildInputs = [ lndir ];
propagatedUserEnvPkgs = builtins.map lib.getBin ([drv] ++ pkgs);
unpackPhase = "true";
configurePhase = "runHook preConfigure; runHook postConfigure";
buildPhase = "true";
installPhase = ''
runHook preInstall
propagated=""
for i in $propagatedUserEnvPkgs; do
findInputs $i propagated propagated-user-env-packages
done
for tgt in bin etc/xdg lib/libexec lib/qt5 share; do
mkdir -p "$out/$tgt"
for p in $propagated; do
if [ -d "$p/$tgt" ]; then
lndir -silent "$p/$tgt" "$out/$tgt" >/dev/null 2>&1
fi
done
done
runHook postInstall
'';
}

View File

@ -0,0 +1,47 @@
{ stdenv, lib, makeWrapper, kdeEnv }:
drv:
{ targets, paths ? [] }:
let
env = kdeEnv drv paths;
in
stdenv.mkDerivation {
inherit (drv) name;
drv = lib.getBin drv;
inherit env targets;
passthru = { unwrapped = drv; };
nativeBuildInputs = [ makeWrapper ];
unpackPhase = "true";
configurePhase = "runHook preConfigure; runHook postConfigure";
buildPhase = "true";
installPhase = ''
for t in $targets; do
if [ -a "$drv/$t" ]; then
makeWrapper "$drv/$t" "$out/$t" \
--argv0 '"$0"' \
--suffix PATH : "$out/bin:$env/bin" \
--prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
--prefix XDG_DATA_DIRS : "$env/share" \
--set QML_IMPORT_PATH "$env/lib/qt5/imports" \
--set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
--set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
else
echo "no such file or directory: $drv/$t"
exit 1
fi
done
for s in applications dbus-1 desktop-directories icons mime polkit-1; do
if [ -d "$env/share/$s" ]; then
mkdir -p "$out/share"
ln -s "$env/share/$s" "$out/share/$s"
fi
done
'';
}

View File

@ -1,57 +1,9 @@
_ecmSetXdgDirs() { _ecmSetXdgDirs() {
addToSearchPathOnce XDG_DATA_DIRS "$1/share" addToSearchPathOnce XDG_DATA_DIRS "$1/share"
addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg" addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
addToSearchPathOnce RUNTIME_XDG_CONFIG_DIRS "$1/etc/xdg"
} }
_ecmSharePaths=( \ envHooks+=(_ecmSetXdgDirs)
"appdata" \
"applications" \
"config.cfg" \
"dbus-1" \
"desktop-directories" \
"doc" \
"icons" \
"kconf_update" \
"kservices5" \
"kservicetypes5" \
"knotifications5" \
"kxmlgui5" \
"locale" \
"mime" \
"polkit-1" \
"sounds" \
"templates" \
"wallpapers" \
)
_ecmPropagateNative() {
for dir in ${_ecmSharePaths[@]}; do
if [ -d "$1/share/$dir" ]; then
propagateOnce propagatedNativeBuildInputs "$1"
if [ -z "$crossConfig" ]; then
propagateOnce propagatedUserEnvPkgs "$1"
addToSearchPathOnce RUNTIME_XDG_DATA_DIRS "$1/share"
fi
break
fi
done
}
envHooks+=(_ecmSetXdgDirs _ecmPropagate)
_ecmPropagate() {
for dir in ${_ecmSharePaths[@]}; do
if [ -d "$1/share/$dir" ]; then
propagateOnce propagatedBuildInputs "$1"
propagateOnce propagatedUserEnvPkgs "$1"
addToSearchPathOnce RUNTIME_XDG_DATA_DIRS "$1/share"
break
fi
done
}
crossEnvHooks+=(_ecmPropagate)
_ecmConfig() { _ecmConfig() {
# Because we need to use absolute paths here, we must set *all* the paths. # Because we need to use absolute paths here, we must set *all* the paths.
@ -59,41 +11,41 @@ _ecmConfig() {
cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec" cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputBin}/lib/libexec"
cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins" cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/lib/qt5/plugins"
cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins" cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/lib/qt5/plugins"
cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports" cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputBin}/lib/qt5/imports"
cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml" cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/lib/qt5/qml"
cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share" cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share"
cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share" cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputBin}/share"
cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML" cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML"
cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg" cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg"
cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update" cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update"
cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5" cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5"
cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5" cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5"
cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5" cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5"
cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5" cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5"
cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons" cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons"
cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputBin}/share/locale"
cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds" cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds"
cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates" cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates"
cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers" cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers"
cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications" cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputBin}/share/applications"
cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories" cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories"
cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages" cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages"
cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata" cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata"
cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man" cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputBin}/share/man"
cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info" cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputBin}/share/info"
cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1" cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1"
cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces" cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces"
cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services" cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services"
cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services" cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services"
cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc" cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc"
cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg" cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg"
cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart" cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart"
} }
preConfigureHooks+=(_ecmConfig) preConfigureHooks+=(_ecmConfig)