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:
Thomas Tuegel 2017-05-22 13:49:07 -05:00
parent 087f20e8c6
commit faf0d3e91d
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
106 changed files with 533 additions and 338 deletions

View File

@ -52,8 +52,8 @@ in
};
security.wrappers = {
kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass";
"start_kdeinit".source = "${pkgs.kinit.out}/lib/libexec/kf5/start_kdeinit";
kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass";
"start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
};
environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;

View File

@ -1,8 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules,
akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
akonadi
akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes,
kio, kitemmodels, kmime, ktextwidgets, qtwebengine,
}:
mkDerivation {
@ -13,7 +13,9 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine
akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio
kitemmodels kmime ktextwidgets qtwebengine
];
propagatedBuildInputs = [ akonadi ];
outputs = [ "out" "dev" ];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
akonadi, kdbusaddons, kio, kitemmodels, kmime
akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
}:
mkDerivation {
@ -11,5 +11,6 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ];
buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
outputs = [ "out" "dev" ];
}

View File

@ -3,8 +3,8 @@
extra-cmake-modules, kdoctools,
karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, kitemmodels,
khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive,
# Archive tools
p7zip, unzipNLS, zip,
@ -17,9 +17,10 @@ mkDerivation {
name = "ark";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
propagatedBuildInputs = [
khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
kpty kwidgetsaddons libarchive kitemmodels
karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio kitemmodels
kparts kpty kservice kwidgetsaddons libarchive
];
outputs = [ "out" "dev" ];
postFixup =
let
PATH =

View File

@ -14,4 +14,5 @@ mkDerivation {
propagatedBuildInputs = [
baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice
];
outputs = [ "out" "dev" ];
}

View File

@ -20,4 +20,5 @@ mkDerivation {
kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
phonon solid
];
outputs = [ "out" "dev" ];
}

View File

@ -13,9 +13,8 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ exiv2 lcms2 ];
propagatedBuildInputs = [
baloo kactivities kdelibs4support kio libkdcraw libkipi phonon
buildInputs = [
baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon
qtimageformats qtsvg qtx11extras
];
propagatedUserEnvPkgs = [ kipi-plugins ];

View File

@ -1,8 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
ki18n,
kcoreaddons, kconfig, kcodecs
kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
}:
mkDerivation {
@ -12,6 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ki18n ];
propagatedBuildInputs = [ kcoreaddons kconfig kcodecs ];
buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, ki18n,
kcodecs
kcodecs, qtbase,
}:
mkDerivation {
@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ki18n ];
buildInputs = [ kcodecs ];
buildInputs = [ kcodecs qtbase ];
}

View File

@ -8,6 +8,7 @@
, kcoreaddons
, kdbusaddons
, kdelibs4support
, kwallet
, kxmlgui
}:
@ -18,8 +19,8 @@ mkDerivation {
maintainers = with lib.maintainers; [ fridh ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
buildInputs = [
kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
kxmlgui
kwallet kxmlgui
];
}

View File

@ -4,18 +4,17 @@
djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
libspectre, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
}:
mkDerivation {
name = "okular";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ djvulibre ebook_tools ];
propagatedBuildInputs = [
kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
buildInputs = [
djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio
kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler qca-qt5
qtdeclarative qtsvg threadweaver
kparts kpty kwallet kwindowsystem libkexiv2 libspectre phonon poppler
qca-qt5 qtdeclarative qtsvg threadweaver
];
meta = {
platforms = lib.platforms.linux;

View File

@ -4,6 +4,7 @@
ki18n, xcb-util-cursor,
kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
qtx11extras
}:
mkDerivation {
@ -13,7 +14,7 @@ mkDerivation {
buildInputs = [ ki18n xcb-util-cursor ];
propagatedBuildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras
];
propagatedUserEnvPkgs = [ kipi-plugins ];
}

View File

@ -7,11 +7,10 @@
mkDerivation {
name = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
propagatedBuildInputs = [
buildInputs = [
bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
kdbusaddons kded kiconthemes knotifications kwidgetsaddons
];
propagatedUserEnvPkgs = [ bluez-qt.out ];
postInstall = ''
# 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

View File

@ -2,7 +2,8 @@
mkDerivation,
extra-cmake-modules,
frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative,
qtx11extras
}:
mkDerivation {
@ -11,7 +12,8 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration
kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras
kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
qtx11extras
];
cmakeFlags = [ "-DUSE_Qt4=OFF" ];
}

View File

@ -7,7 +7,7 @@
mkDerivation {
name = "kactivitymanagerd";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
buildInputs = [
boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
kxmlgui
];

View File

@ -1,14 +1,14 @@
{
mkDerivation, extra-cmake-modules,
kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
kwindowsystem, qtsvg, qtx11extras
mkDerivation, extra-cmake-modules, kdoctools,
kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
qtsvg, qtx11extras,
}:
mkDerivation {
name = "kde-cli-tools";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg
buildInputs = [
kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
qtx11extras
];
}

View File

@ -16,7 +16,7 @@ mkDerivation {
name = "kde-gtk-config";
patches = [ ./0001-follow-symlinks.patch ];
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
buildInputs = [
ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
knewstuff
];

View File

@ -1,17 +1,17 @@
{ mkDerivation, extra-cmake-modules, kdoctools
, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
, ibus
{
mkDerivation,
extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio,
knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
plasma-framework, plasma-workspace, qtdeclarative, qtx11extras,
}:
mkDerivation {
name = "kdeplasma-addons";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
buildInputs = [
kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
kross krunner kservice ksysguard kunitconversion plasma-framework
kross krunner kservice ksysguard kunitconversion ibus plasma-framework
plasma-workspace qtdeclarative qtx11extras
ibus
];
}

View File

@ -1,9 +1,11 @@
{ mkDerivation, extra-cmake-modules, kdoctools, kdelibs4support
, qtx11extras
{
mkDerivation,
extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, ki18n, qtx11extras,
}:
mkDerivation {
name = "kgamma5";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kdelibs4support qtx11extras ];
buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ];
}

View File

@ -7,8 +7,8 @@
mkDerivation {
name = "khotkeys";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
qtx11extras kcmutils kdbusaddons kxmlgui
buildInputs = [
kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
plasma-framework plasma-workspace qtx11extras
];
}

View File

@ -9,7 +9,7 @@
mkDerivation {
name = "kinfocenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid

View File

@ -6,8 +6,8 @@
mkDerivation {
name = "kscreen";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
buildInputs = [
kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui
libkscreen qtdeclarative qtgraphicaleffects
];
}

View File

@ -2,7 +2,8 @@
mkDerivation,
extra-cmake-modules, kdoctools,
kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras,
wayland,
}:
mkDerivation {
@ -10,6 +11,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
libXcursor pam plasma-framework qtdeclarative wayland
libXcursor pam plasma-framework qtdeclarative qtx11extras wayland
];
}

View File

@ -1,9 +1,11 @@
{ mkDerivation, extra-cmake-modules, kdoctools, kcoreaddons
, ki18n, kwallet, kwidgetsaddons
{
mkDerivation,
extra-cmake-modules, kdoctools,
kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase,
}:
mkDerivation {
name = "ksshaskpass";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ];
}

View File

@ -2,7 +2,6 @@
mkDerivation {
name = "kwallet-pam";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ pam socat libgcrypt qtbase ];
postPatch = ''

View File

@ -1,7 +1,11 @@
{ mkDerivation , extra-cmake-modules , kidletime , kwayland , kwindowsystem }:
{
mkDerivation,
extra-cmake-modules,
kidletime, kwayland, kwindowsystem, qtbase,
}:
mkDerivation {
name = "kwayland-integration";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kidletime kwindowsystem kwayland ];
buildInputs = [ kidletime kwindowsystem kwayland qtbase ];
}

View File

@ -1,9 +1,11 @@
{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty
, knotifications, kdbusaddons
{
mkDerivation,
extra-cmake-modules,
kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase,
}:
mkDerivation {
name = "kwrited";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ];
}

View File

@ -1,6 +1,8 @@
{ mkDerivation, extra-cmake-modules, qtscript, qtdeclarative
, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
, krunner
{
mkDerivation,
extra-cmake-modules,
kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework,
qtscript, qtdeclarative,
}:
mkDerivation {
@ -8,8 +10,8 @@ mkDerivation {
nativeBuildInputs = [
extra-cmake-modules
];
propagatedBuildInputs = [
kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
kcoreaddons kservice
buildInputs = [
kcoreaddons kdeclarative ki18n krunner kservice plasma-framework
qtdeclarative qtscript
];
}

View File

@ -2,7 +2,8 @@
mkDerivation,
extra-cmake-modules,
frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative,
qtx11extras
}:
mkDerivation {
@ -10,6 +11,8 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
qtx11extras
];
outputs = [ "out" "dev" "bin" ];
}

View File

@ -1,17 +1,17 @@
{ mkDerivation, extra-cmake-modules
, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
, libXcursor
{
mkDerivation,
extra-cmake-modules,
breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications,
kwayland, libXcursor
}:
# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
mkDerivation {
name = "plasma-integration";
nativeBuildInputs = [
extra-cmake-modules
];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland
breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
libXcursor
];
}

View File

@ -1,10 +1,11 @@
{ mkDerivation, substituteAll, extra-cmake-modules, kdoctools
, kcompletion, kconfigwidgets, kcoreaddons, 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
, qca-qt5, qtdeclarative, solid, openvpn
{
mkDerivation, substituteAll,
extra-cmake-modules, kdoctools,
kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications,
kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt,
openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid
}:
mkDerivation {
@ -19,8 +20,8 @@ mkDerivation {
inherit openvpn;
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui

View File

@ -1,15 +1,15 @@
{
mkDerivation,
extra-cmake-modules,
gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
extra-cmake-modules, kdoctools,
gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,
libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative
}:
mkDerivation {
name = "plasma-pa";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
gconf glib kconfigwidgets kcoreaddons kdeclarative
kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework
buildInputs = [
gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n
libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative
];
}

View File

@ -8,4 +8,5 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,14 +1,17 @@
{ mkDerivation, lib, extra-cmake-modules, kauth, kconfig
, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
, kio, lmdb, qtbase, solid
{
mkDerivation, lib,
extra-cmake-modules,
kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n,
kidletime, kio, lmdb, qtbase, qtdeclarative, solid,
}:
mkDerivation {
name = "baloo";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
kidletime lmdb qtbase solid
buildInputs = [
kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative
solid
];
propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ];
}

View File

@ -10,9 +10,10 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtdeclarative ];
buildInputs = [ qtdeclarative ];
propagatedBuildInputs = [ qtbase ];
preConfigure = ''
substituteInPlace CMakeLists.txt \
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
--replace /lib/udev/rules.d "$bin/lib/udev/rules.d"
'';
}

View File

@ -3,8 +3,7 @@
mkDerivation {
name = "breeze-icons";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
outputs = [ "out" ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtsvg ];
propagatedUserEnvPkgs = [ qtsvg.out ];
outputs = [ "out" ]; # only runtime outputs
}

View File

@ -39,11 +39,11 @@ let
# SUPPORT
let
propagateBin =
propagate = out:
let setupHook = { writeScript }:
writeScript "setup-hook.sh" ''
# Propagate $bin output
propagatedUserEnvPkgs+=" @bin@"
# Propagate $${out} output
propagatedUserEnvPkgs+=" @${out}@"
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
@ -57,9 +57,11 @@ let
'';
in callPackage setupHook {};
propagateBin = propagate "bin";
callPackage = self.newScope {
inherit propagateBin;
inherit propagate propagateBin;
mkDerivation = args:
let

View File

@ -1,17 +1,16 @@
_ecmSetXdgDirs() {
_ecmEnvHook() {
addToSearchPath XDG_DATA_DIRS "$1/share"
addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
}
envHooks+=(_ecmEnvHook)
envHooks+=(_ecmSetXdgDirs)
_ecmConfig() {
_ecmPreConfigureHook() {
# Because we need to use absolute paths here, we must set *all* the paths.
cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputBin}/lib/libexec"
cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
@ -25,7 +24,7 @@ _ecmConfig() {
cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5"
cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5"
cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons"
cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputBin}/share/locale"
cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds"
cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates"
cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers"
@ -52,5 +51,4 @@ _ecmConfig() {
cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"
fi
}
preConfigureHooks+=(_ecmConfig)
preConfigureHooks+=(_ecmPreConfigureHook)

View File

@ -9,8 +9,9 @@ mkDerivation {
name = "frameworkintegration";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras
buildInputs = [
kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage
kwidgetsaddons libXcursor qtx11extras
];
propagatedBuildInputs = [ kconfigwidgets kiconthemes ];
}

View File

@ -1,8 +1,14 @@
{ mkDerivation, lib, extra-cmake-modules, boost, kactivities, kconfig }:
{
mkDerivation, lib,
extra-cmake-modules,
boost, kactivities, kconfig, qtbase,
}:
mkDerivation {
name = "kactivities-stats";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ boost kactivities kconfig ];
buildInputs = [ boost kactivities kconfig ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,14 +1,15 @@
{ mkDerivation, lib, extra-cmake-modules, boost, kcmutils, kconfig
, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
{
mkDerivation, lib,
extra-cmake-modules,
boost, kconfig, kcoreaddons, kio, kwindowsystem, qtbase, qtdeclarative,
}:
mkDerivation {
name = "kactivities";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
ki18n kio kservice kwindowsystem kxmlgui qtdeclarative
buildInputs = [
boost kconfig kcoreaddons kio kwindowsystem qtdeclarative
];
propagatedBuildInputs = [ qtbase ];
}

View File

@ -4,4 +4,7 @@ mkDerivation {
name = "kapidox";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules python ];
postFixup = ''
moveToOutput bin $bin
'';
}

View File

@ -1,4 +1,8 @@
{ mkDerivation, lib, extra-cmake-modules, qtbase }:
{
mkDerivation, lib,
extra-cmake-modules,
bzip2, lzma, qtbase, zlib,
}:
mkDerivation {
name = "karchive";
@ -7,5 +11,7 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
buildInputs = [ bzip2 lzma zlib ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,12 +1,17 @@
{
mkDerivation, lib, copyPathsToStore,
mkDerivation, lib, copyPathsToStore, propagate,
extra-cmake-modules, kcoreaddons, polkit-qt, qttools
}:
mkDerivation {
name = "kauth";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ kcoreaddons polkit-qt ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ polkit-qt qttools ];
propagatedBuildInputs = [ kcoreaddons ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
# library stores reference to plugin path,
# separating $out from $bin would create a reference cycle
outputs = [ "out" "dev" ];
setupHook = propagate "out";
}

View File

@ -1,13 +1,17 @@
{
mkDerivation, lib, extra-cmake-modules,
kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui
mkDerivation, lib,
extra-cmake-modules, qttools,
kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kwidgetsaddons,
kxmlgui, qtbase,
}:
mkDerivation {
name = "kbookmarks";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [
kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
];
propagatedBuildInputs = [ kwidgetsaddons qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -2,16 +2,17 @@
mkDerivation, lib,
extra-cmake-modules,
kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
kpackage, kservice, kxmlgui
kpackage, kservice, kxmlgui, qtdeclarative,
}:
mkDerivation {
name = "kcmutils";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
kpackage kservice kxmlgui
buildInputs = [
kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui
qtdeclarative
];
propagatedBuildInputs = [ kconfigwidgets kservice ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
}

View File

@ -6,6 +6,8 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -7,6 +7,8 @@
mkDerivation {
name = "kcompletion";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ kconfig kwidgetsaddons qtbase ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfig kwidgetsaddons qttools ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -6,6 +6,7 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];
}

View File

@ -1,17 +1,20 @@
{
mkDerivation, lib, extra-cmake-modules,
kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons
kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons, qtbase,
}:
mkDerivation {
name = "kconfigwidgets";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons
];
buildInputs = [ kguiaddons ki18n qtbase ];
propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
outputs = [ "out" "dev" ];
preConfigure = ''
outputBin=dev
'';
postInstall = ''
moveToOutput "bin/preparetips5" "$dev"
moveToOutput share/man $dev
'';
}

View File

@ -1,4 +1,8 @@
{ mkDerivation, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
{
mkDerivation, lib, fetchurl, writeScript,
extra-cmake-modules,
qtbase, qttools, shared_mime_info
}:
mkDerivation {
name = "kcoreaddons";
@ -6,6 +10,7 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ qtbase shared_mime_info ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools shared_mime_info ];
propagatedBuildInputs = [ qtbase ];
}

View File

@ -1,8 +1,14 @@
{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
{
mkDerivation, lib,
extra-cmake-modules,
kcoreaddons, kwindowsystem, qtbase, qtx11extras,
}:
mkDerivation {
name = "kcrash";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,4 +1,8 @@
{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
{
mkDerivation, lib,
extra-cmake-modules,
qtbase, qttools, qtx11extras
}:
mkDerivation {
name = "kdbusaddons";
@ -6,6 +10,7 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ qtx11extras ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools qtx11extras ];
propagatedBuildInputs = [ qtbase ];
}

View File

@ -8,8 +8,9 @@ mkDerivation {
name = "kdeclarative";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
kwidgetsaddons kwindowsystem qtdeclarative
buildInputs = [
epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
kwindowsystem
];
propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
}

View File

@ -1,13 +1,16 @@
{
mkDerivation, lib, extra-cmake-modules,
kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice
mkDerivation, lib, propagate,
extra-cmake-modules, kdoctools,
kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase,
}:
mkDerivation {
name = "kded";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kinit kservice
buildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase
];
outputs = [ "out" "dev" ];
setupHook = propagate "out";
}

View File

@ -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" ];
}

View File

@ -2,15 +2,15 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio,
kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, sonnet
kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, qttools, sonnet,
}:
mkDerivation {
name = "kdesignerplugin";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio
kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
buildInputs = [
kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews
kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet
];
}

View File

@ -1,10 +1,14 @@
{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
, kservice
{
mkDerivation, lib,
extra-cmake-modules,
kcoreaddons, ki18n, kpty, kservice, qtbase,
}:
mkDerivation {
name = "kdesu";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ];
propagatedBuildInputs = [ kpty ];
outputs = [ "out" "dev" ];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, qttools,
avahi, qtbase
extra-cmake-modules,
avahi, qtbase, qttools,
}:
mkDerivation {
@ -10,6 +10,8 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ avahi qtbase ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ avahi qttools ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,18 +1,28 @@
{
mkDerivation, lib,
extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
karchive, ki18n, perl, perlPackages
karchive, ki18n, qtbase,
perl, perlPackages
}:
mkDerivation {
name = "kdoctools";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ karchive ki18n ];
propagatedNativeBuildInputs = [ perl perlPackages.URI ];
buildInputs = [ karchive ki18n ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
patches = [ ./kdoctools-no-find-docbook-xml.patch ];
preConfigure = ''
outputBin=dev
'';
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
];
patches = [ ./kdoctools-no-find-docbook-xml.patch ];
postFixup = ''
moveToOutput "share/doc" "$dev"
moveToOutput "share/man" "$dev"
'';
}

View File

@ -1,12 +1,13 @@
{
mkDerivation, lib,
extra-cmake-modules,
karchive, kconfig, kcoreaddons, kservice
karchive, kcoreaddons, kservice, qtbase,
}:
mkDerivation {
name = "kemoticons";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
buildInputs = [ karchive kcoreaddons ];
propagatedBuildInputs = [ kservice qtbase ];
}

View File

@ -7,9 +7,10 @@
mkDerivation {
name = "kfilemetadata";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
buildInputs = [
attr ebook_tools exiv2 ffmpeg karchive ki18n poppler taglib
];
propagatedBuildInputs = [ qtbase ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
}

View File

@ -2,14 +2,19 @@
mkDerivation, lib,
extra-cmake-modules,
kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
qtx11extras
qtbase, qttools, qtx11extras,
}:
mkDerivation {
name = "kglobalaccel";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras
buildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools
qtx11extras
];
propagatedBuildInputs = [ qtbase ];
postPatch = ''
sed -i src/runtime/org.kde.kglobalaccel.service.in \
-e "s|@CMAKE_INSTALL_PREFIX@|''${!outputBin}|"
'';
}

View File

@ -11,5 +11,7 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtx11extras ];
buildInputs = [ qtx11extras ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -10,9 +10,10 @@ mkDerivation {
name = "khtml";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules perl ];
propagatedBuildInputs = [
giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs
knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem
kxmlgui phonon qtx11extras sonnet
buildInputs = [
giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications
kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui phonon
qtx11extras sonnet
];
propagatedBuildInputs = [ kjs ];
}

View File

@ -12,5 +12,5 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedNativeBuildInputs = [ gettext python ];
propagatedBuildInputs = [ qtdeclarative qtscript ];
buildInputs = [ qtdeclarative qtscript ];
}

View File

@ -1,7 +1,8 @@
{
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules,
karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews,
qtbase, qtsvg,
}:
mkDerivation {
@ -9,5 +10,8 @@ mkDerivation {
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ];
buildInputs = [
breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews
];
propagatedBuildInputs = [ qtbase qtsvg ];
}

View File

@ -11,5 +11,6 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase qtx11extras ];
buildInputs = [ qtx11extras ];
propagatedBuildInputs = [ qtbase ];
}

View File

@ -1,14 +1,16 @@
{
mkDerivation, lib,
extra-cmake-modules,
ilmbase, karchive, qtbase
ilmbase, karchive, openexr, qtbase
}:
let inherit (lib) getDev; in
mkDerivation {
name = "kimageformats";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ilmbase qtbase ];
propagatedBuildInputs = [ karchive ];
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
buildInputs = [ karchive openexr qtbase ];
outputs = [ "out" ]; # plugins only
NIX_CFLAGS_COMPILE = "-I${getDev ilmbase}/include/OpenEXR";
}

View File

@ -1,5 +1,5 @@
{
mkDerivation, lib, copyPathsToStore,
mkDerivation, lib, copyPathsToStore, writeScript,
extra-cmake-modules, kdoctools,
kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework
}:
@ -10,7 +10,7 @@ mkDerivation {
name = "kinit";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
buildInputs = [
kconfig kcrash ki18n kio kservice kwindowsystem
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
@ -19,4 +19,18 @@ mkDerivation {
''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"''
''-DNIXPKGS_KF5_PLASMA="${getLib plasma-framework}/lib/libKF5Plasma.so.5"''
];
postFixup = ''
moveToOutput "lib/libexec/kf5/start_kdeinit" "$bin"
'';
setupHook = writeScript "setup-hook.sh" ''
kinitFixupOutputHook() {
if [ $prefix != ''${!outputBin} ] && [ -d $prefix/lib ]; then
mkdir -p ''${!outputBin}/lib
find $prefix/lib -maxdepth 1 -name 'libkdeinit5_*.so' -exec ln -s \{\} ''${!outputBin}/lib \;
rmdir --ignore-fail-on-non-empty ''${!outputBin}/lib
fi
}
fixupOutputHooks+=(kinitFixupOutputHook)
'';
}

View File

@ -1,21 +1,23 @@
{
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, kdoctools,
acl, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
qtscript, qtx11extras, solid, fetchpatch
qtbase, qtscript, qtx11extras, solid,
}:
mkDerivation {
name = "kio";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras
];
propagatedBuildInputs = [
acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
qtx11extras
kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice
kxmlgui qtbase solid
];
patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
}

View File

@ -12,4 +12,5 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -10,6 +10,8 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -8,5 +8,5 @@ mkDerivation {
name = "kjobwidgets";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
}

View File

@ -1,10 +1,12 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools
extra-cmake-modules, kdoctools,
qtbase,
}:
mkDerivation {
name = "kjs";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtbase ];
}

View File

@ -1,11 +1,13 @@
{
mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kjs
, qtsvg
mkDerivation, lib,
extra-cmake-modules, kdoctools, qttools,
ki18n, kjs, qtsvg,
}:
mkDerivation {
name = "kjsembed";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ ki18n kjs qtsvg ];
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [ ki18n qtsvg ];
propagatedBuildInputs = [ kjs ];
}

View File

@ -8,5 +8,5 @@ mkDerivation {
name = "kmediaplayer";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kparts kxmlgui ];
buildInputs = [ kparts kxmlgui ];
}

View File

@ -1,14 +1,18 @@
{ mkDerivation, lib, extra-cmake-modules, attica, karchive
, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
{
mkDerivation, lib,
extra-cmake-modules,
attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes,
kio, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase,
qtdeclarative,
}:
mkDerivation {
name = "knewstuff";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui
buildInputs = [
karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews
ktextwidgets kwidgetsaddons qtbase qtdeclarative
];
propagatedBuildInputs = [ attica kservice kxmlgui ];
}

View File

@ -10,7 +10,7 @@ mkDerivation {
name = "knotifications";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [
buildInputs = [
kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
];
}

View File

@ -1,10 +1,14 @@
{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
, ki18n, kio, phonon
{
mkDerivation, lib,
extra-cmake-modules,
kcompletion, kconfig, ki18n, kio, phonon, qtbase,
}:
mkDerivation {
name = "knotifyconfig";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ];
buildInputs = [ kcompletion kconfig ki18n kio phonon ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,13 +1,13 @@
{
mkDerivation, fetchurl, lib, copyPathsToStore,
extra-cmake-modules, kdoctools,
karchive, kconfig, kcoreaddons, ki18n
karchive, kconfig, kcoreaddons, ki18n, qtbase,
}:
mkDerivation {
name = "kpackage";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
}

View File

@ -1,14 +1,17 @@
{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
, ktextwidgets, kwidgetsaddons, kxmlgui
{
mkDerivation, lib,
extra-cmake-modules,
kconfig, kcoreaddons, ki18n, kiconthemes, kio, kjobwidgets, knotifications,
kservice, ktextwidgets, kwidgetsaddons, kxmlgui
}:
mkDerivation {
name = "kparts";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications
kservice ktextwidgets kwidgetsaddons kxmlgui
buildInputs = [
kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice
kwidgetsaddons
];
propagatedBuildInputs = [ kio ktextwidgets kxmlgui ];
}

View File

@ -1,12 +1,16 @@
{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n
, kitemviews, kservice, kwidgetsaddons, qtdeclarative
{
mkDerivation, lib,
extra-cmake-modules,
kcoreaddons, ki18n, kitemviews, kservice, kwidgetsaddons, qtbase,
qtdeclarative,
}:
mkDerivation {
name = "kpeople";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
buildInputs = [
kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
];
propagatedBuildInputs = [ qtbase ];
}

View File

@ -9,5 +9,6 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,8 +1,9 @@
{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n }:
{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }:
mkDerivation {
name = "kpty";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcoreaddons ki18n ];
buildInputs = [ kcoreaddons ki18n qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,14 +1,14 @@
{ mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons
, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
, kxmlgui, qtscript
, kxmlgui, qtbase, qtscript, qtxmlpatterns,
}:
mkDerivation {
name = "kross";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcompletion kcoreaddons kxmlgui ];
propagatedBuildInputs = [
kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui
qtscript
ki18n kiconthemes kio kparts kwidgetsaddons qtbase qtscript qtxmlpatterns
];
}

View File

@ -1,14 +1,17 @@
{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
, ki18n, kio, kservice, plasma-framework, solid
, threadweaver
{
mkDerivation, lib,
extra-cmake-modules,
kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase,
qtdeclarative, solid, threadweaver
}:
mkDerivation {
name = "krunner";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kconfig kcoreaddons ki18n kio kservice plasma-framework solid
buildInputs = [
kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
threadweaver
];
propagatedBuildInputs = [ plasma-framework qtbase ];
}

View File

@ -1,14 +1,18 @@
{
mkDerivation, lib, copyPathsToStore,
bison, extra-cmake-modules, flex,
kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem,
qtbase,
}:
mkDerivation {
name = "kservice";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ];
nativeBuildInputs = [ kdoctools ];
propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedNativeBuildInputs = [ bison flex ];
buildInputs = [
kcrash kdbusaddons ki18n kwindowsystem qtbase
];
propagatedBuildInputs = [ kconfig kcoreaddons ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
}

View File

@ -1,17 +1,17 @@
{ mkDerivation, lib, copyPathsToStore
, extra-cmake-modules, perl
, karchive, kconfig, kguiaddons, kiconthemes, kparts
, libgit2
, qtscript, qtxmlpatterns
, ki18n, kio, sonnet, syntax-highlighting
{
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, perl,
karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
qtscript, qtxmlpatterns, sonnet, syntax-highlighting
}:
mkDerivation {
name = "ktexteditor";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules perl ];
propagatedBuildInputs = [
karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
buildInputs = [
karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript
qtxmlpatterns sonnet syntax-highlighting
];
propagatedBuildInputs = [ kparts ];
}

View File

@ -1,14 +1,16 @@
{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
, sonnet
{
mkDerivation, lib,
extra-cmake-modules,
kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kservice,
kwindowsystem, qtbase, sonnet,
}:
mkDerivation {
name = "ktextwidgets";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem
sonnet
buildInputs = [
kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem
];
propagatedBuildInputs = [ ki18n qtbase sonnet ];
}

View File

@ -1,8 +1,9 @@
{ mkDerivation, lib, extra-cmake-modules, ki18n }:
{ mkDerivation, lib, extra-cmake-modules, ki18n, qtbase, }:
mkDerivation {
name = "kunitconversion";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ ki18n ];
buildInputs = [ ki18n qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,14 +1,18 @@
{ mkDerivation, lib, extra-cmake-modules, kconfig, kconfigwidgets
, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n,
kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem,
libgcrypt, qgpgme, qtbase,
}:
mkDerivation {
name = "kwallet";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
buildInputs = [
kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
knotifications kservice kwidgetsaddons kwindowsystem libgcrypt gpgme
knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme
];
propagatedBuildInputs = [ qtbase ];
}

View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, propagateBin,
extra-cmake-modules,
qtbase, wayland
}:
@ -11,6 +11,7 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ wayland ];
buildInputs = [ wayland ];
propagatedBuildInputs = [ qtbase ];
setupHook = propagateBin; # XDG_CONFIG_DIRS
}

View File

@ -1,5 +1,7 @@
{ mkDerivation, lib
, extra-cmake-modules, qtbase, qttools
{
mkDerivation, lib,
extra-cmake-modules,
qtbase, qttools
}:
mkDerivation {
@ -8,6 +10,8 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -10,10 +10,11 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ qtx11extras ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools qtx11extras ];
propagatedBuildInputs = [ qtbase ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/$qtPluginPrefix\""
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
'';
}

View File

@ -1,14 +1,17 @@
{ mkDerivation, lib, extra-cmake-modules, attica, kconfig
, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
, ktextwidgets, kwindowsystem, sonnet
{
mkDerivation, lib,
extra-cmake-modules,
attica, kconfig, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews,
ktextwidgets, kwindowsystem, qtbase, sonnet,
}:
mkDerivation {
name = "kxmlgui";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews
ktextwidgets kwindowsystem sonnet
buildInputs = [
attica kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem
sonnet
];
propagatedBuildInputs = [ kconfig kconfigwidgets qtbase ];
}

View File

@ -4,5 +4,7 @@ mkDerivation {
name = "kxmlrpcclient";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ ki18n kio ];
buildInputs = [ ki18n ];
propagatedBuildInputs = [ kio ];
outputs = [ "out" "dev" ];
}

View File

@ -1,6 +1,7 @@
{ mkDerivation, lib
, extra-cmake-modules
, modemmanager, qtbase
{
mkDerivation, lib,
extra-cmake-modules,
modemmanager, qtbase
}:
mkDerivation {
@ -10,6 +11,6 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ modemmanager ];
propagatedBuildInputs = [ modemmanager qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -1,6 +1,7 @@
{ mkDerivation, lib
, extra-cmake-modules
, qtbase, networkmanager
{
mkDerivation, lib,
extra-cmake-modules,
networkmanager, qtbase,
}:
mkDerivation {
@ -10,6 +11,6 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ networkmanager ];
propagatedBuildInputs = [ networkmanager qtbase ];
outputs = [ "out" "dev" ];
}

View File

@ -9,7 +9,7 @@ mkDerivation {
license = lib.licenses.lgpl3Plus;
maintainers = [ lib.maintainers.ttuegel ];
};
outputs = [ "out" ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
outputs = [ "out" ]; # only runtime outputs
}

Some files were not shown because too many files have changed in this diff Show More