kdeFrameworks: fixup inputs and outputs
- Reduce environment pollution with a separate $bin output containing programs, plugins, and shared data. Libraries remain in $out and are not installed into the environment. - Only propagate build inputs as required.
This commit is contained in:
@@ -1,12 +1,11 @@
|
||||
{
|
||||
mkDerivation, lib, copyPathsToStore,
|
||||
extra-cmake-modules, kdoctools,
|
||||
docbook_xml_dtd_45, kauth, karchive, kcompletion, kconfig, kconfigwidgets,
|
||||
kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons,
|
||||
kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels, kinit,
|
||||
knotifications, kparts, kservice, ktextwidgets, kunitconversion,
|
||||
kwidgetsaddons, kwindowsystem, kxmlgui, networkmanager, qtsvg, qtx11extras,
|
||||
xlibs
|
||||
docbook_xml_dtd_45, extra-cmake-modules, kdoctools,
|
||||
kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash,
|
||||
kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons,
|
||||
ki18n, kiconthemes, kio, kitemmodels, kinit, knotifications, kparts, kservice,
|
||||
ktextwidgets, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui,
|
||||
networkmanager, qtbase, qtsvg, qttools, qtx11extras, xlibs
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@@ -14,16 +13,20 @@ mkDerivation {
|
||||
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
|
||||
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
|
||||
setupHook = ./setup-hook.sh;
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
nativeBuildInputs = [ extra-cmake-modules qttools ];
|
||||
propagatedNativeBuildInputs = [ kdoctools ];
|
||||
buildInputs = [
|
||||
kcompletion kconfig kded kglobalaccel ki18n kio kservice kwidgetsaddons
|
||||
kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash
|
||||
kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n
|
||||
kio kiconthemes kitemmodels kinit knotifications kparts kservice
|
||||
ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui
|
||||
networkmanager qtsvg qtx11extras xlibs.libSM
|
||||
kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons kdesignerplugin
|
||||
kemoticons kguiaddons kiconthemes kitemmodels kinit knotifications kparts
|
||||
ktextwidgets kunitconversion kwindowsystem qtbase
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
|
||||
"-DDocBookXML4_DTD_VERSION=4.5"
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user