remove kf515.makeKDEWrapper

This commit is contained in:
Thomas Tuegel 2015-10-18 09:24:59 -05:00
parent fa81cf0874
commit 5292e67e50
33 changed files with 132 additions and 149 deletions

View file

@ -1,13 +1,13 @@
{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons
, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications
, kwidgetsaddons, kwindowsystem, makeKDEWrapper, plasma-framework
, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework
, qtdeclarative, shared_mime_info
}:
plasmaPackage {
name = "bluedevil";
nativeBuildInputs = [
extra-cmake-modules makeKDEWrapper shared_mime_info
extra-cmake-modules makeQtWrapper shared_mime_info
];
buildInputs = [
kcoreaddons kdbusaddons kded kiconthemes knotifications
@ -17,7 +17,7 @@ plasmaPackage {
bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
];
postInstall = ''
wrapKDEProgram "$out/bin/bluedevil-wizard"
wrapKDEProgram "$out/bin/bluedevil-sendfile"
wrapQtProgram "$out/bin/bluedevil-wizard"
wrapQtProgram "$out/bin/bluedevil-sendfile"
'';
}

View file

@ -1,6 +1,6 @@
{ plasmaPackage, extra-cmake-modules, frameworkintegration
, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
, ki18n, kwindowsystem, makeKDEWrapper, qtx11extras
, ki18n, kwindowsystem, makeQtWrapper, qtx11extras
}:
plasmaPackage {
@ -8,14 +8,14 @@ plasmaPackage {
sname = "breeze";
nativeBuildInputs = [
extra-cmake-modules
makeKDEWrapper
makeQtWrapper
];
buildInputs = [
kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
];
propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
cmakeFlags = [ "-DUSE_KDE4=OFF" ];
cmakeFlags = [ "-DUSE_Qt4=OFF" ];
postInstall = ''
wrapKDEProgram "$out/bin/breeze-settings5"
wrapQtProgram "$out/bin/breeze-settings5"
'';
}

View file

@ -1,11 +1,11 @@
{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig
, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes
, kwindowsystem, makeKDEWrapper, qtsvg, qtx11extras
, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras
}:
plasmaPackage {
name = "kde-cli-tools";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [
kcmutils kconfig kdesu kiconthemes
];
@ -13,15 +13,15 @@ plasmaPackage {
kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
];
postInstall = ''
wrapKDEProgram "$out/bin/kmimetypefinder5"
wrapKDEProgram "$out/bin/ksvgtopng5"
wrapKDEProgram "$out/bin/ktraderclient5"
wrapKDEProgram "$out/bin/kioclient5"
wrapKDEProgram "$out/bin/kdecp5"
wrapKDEProgram "$out/bin/keditfiletype5"
wrapKDEProgram "$out/bin/kcmshell5"
wrapKDEProgram "$out/bin/kdemv5"
wrapKDEProgram "$out/bin/kstart5"
wrapKDEProgram "$out/bin/kde-open5"
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,6 +1,6 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support
, khtml, kservice, makeKDEWrapper
, khtml, kservice, makeQtWrapper
}:
plasmaPackage {
@ -8,13 +8,13 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
makeQtWrapper
];
buildInputs = [
kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
];
propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
postInstall = ''
wrapKDEProgram "$out/bin/khelpcenter"
wrapQtProgram "$out/bin/khelpcenter"
'';
}

View file

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

View file

@ -1,5 +1,5 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui
, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeKDEWrapper
, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper
}:
plasmaPackage {
@ -7,13 +7,13 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
makeQtWrapper
];
buildInputs = [
kxmlgui kdbusaddons kiconthemes
];
propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ];
postInstall = ''
wrapKDEProgram "$out/bin/kmenuedit"
wrapQtProgram "$out/bin/kmenuedit"
'';
}

View file

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

View file

@ -1,13 +1,13 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
, ki18n, kwallet, kwidgetsaddons, makeKDEWrapper
, ki18n, kwallet, kwidgetsaddons, makeQtWrapper
}:
plasmaPackage {
name = "ksshaskpass";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
propagatedBuildInputs = [ ki18n ];
postInstall = ''
wrapKDEProgram "$out/bin/ksshaskpass"
wrapQtProgram "$out/bin/ksshaskpass"
'';
}

View file

@ -1,6 +1,6 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
, kiconthemes, libksysguard, makeKDEWrapper
, kiconthemes, libksysguard, makeQtWrapper
}:
plasmaPackage {
@ -8,14 +8,14 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
makeQtWrapper
];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
];
propagatedBuildInputs = [ kdelibs4support ki18n ];
postInstall = ''
wrapKDEProgram "$out/bin/ksysguardd"
wrapKDEProgram "$out/bin/ksysguard"
wrapQtProgram "$out/bin/ksysguardd"
wrapQtProgram "$out/bin/ksysguard"
'';
}

View file

@ -4,7 +4,7 @@
, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications
, kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem
, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, makeQtWrapper
}:
plasmaPackage {
@ -12,6 +12,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
@ -25,7 +26,7 @@ plasmaPackage {
];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
postInstall = ''
wrapKDEProgram "$out/bin/kwin_x11"
wrapKDEProgram "$out/bin/kwin_wayland"
wrapQtProgram "$out/bin/kwin_x11"
wrapQtProgram "$out/bin/kwin_wayland"
'';
}

View file

@ -1,12 +1,12 @@
{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig
, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion
, frameworkintegration, kwindowsystem, makeKDEWrapper, qtx11extras
, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras
}:
plasmaPackage {
name = "oxygen";
nativeBuildInputs = [
extra-cmake-modules makeKDEWrapper
extra-cmake-modules makeQtWrapper
];
buildInputs = [
kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
@ -14,7 +14,7 @@ plasmaPackage {
];
propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
postInstall = ''
wrapKDEProgram "$out/bin/oxygen-demo5"
wrapKDEProgram "$out/bin/oxygen-settings5"
wrapQtProgram "$out/bin/oxygen-demo5"
wrapQtProgram "$out/bin/oxygen-settings5"
'';
}

View file

@ -6,7 +6,7 @@
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
, libcanberra_kde, libpulseaudio, makeKDEWrapper, utillinux
, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
}:
plasmaPackage rec {
@ -14,7 +14,7 @@ plasmaPackage rec {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
makeQtWrapper
];
buildInputs = [
attica boost fontconfig kcmutils kdbusaddons kded kitemmodels
@ -52,13 +52,13 @@ plasmaPackage rec {
cd "$NIX_BUILD_TOP"
wrapKDEProgram "$out/bin/kaccess"
wrapKDEProgram "$out/bin/solid-action-desktop-gen"
wrapKDEProgram "$out/bin/knetattach"
wrapKDEProgram "$out/bin/krdb"
wrapKDEProgram "$out/bin/kapplymousetheme"
wrapKDEProgram "$out/bin/kfontinst"
wrapKDEProgram "$out/bin/kcm-touchpad-list-devices"
wrapKDEProgram "$out/bin/kfontview"
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 @@
, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
, kxmlgui, makeKDEWrapper, mobile_broadband_provider_info
, kxmlgui, makeQtWrapper, mobile_broadband_provider_info
, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
, qtdeclarative, solid
}:
@ -12,7 +12,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
makeQtWrapper
];
buildInputs = [
kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
@ -25,6 +25,6 @@ plasmaPackage {
qtdeclarative
];
postInstall = ''
wrapKDEProgram "$out/bin/kde5-nm-connection-editor"
wrapQtProgram "$out/bin/kde5-nm-connection-editor"
'';
}

View file

@ -6,7 +6,7 @@
, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt
, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland
, libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig
, kinit, kservice, makeKDEWrapper, qttools, dbus_tools, mkfontdir, xmessage
, kinit, kservice, makeQtWrapper, qttools, dbus_tools, mkfontdir, xmessage
, xprop, xrdb, xset, xsetroot, solid, qtquickcontrols
}:
@ -15,7 +15,7 @@ plasmaPackage rec {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
makeQtWrapper
];
buildInputs = [
kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff
@ -43,19 +43,18 @@ plasmaPackage rec {
'';
postInstall = ''
export QT_WRAPPER_IMPURE=1
export KDE_WRAPPER_IMPURE=1
wrapKDEProgram "$out/bin/ksmserver"
wrapKDEProgram "$out/bin/plasmawindowed"
wrapKDEProgram "$out/bin/kcminit_startup"
wrapKDEProgram "$out/bin/ksplashqml"
wrapKDEProgram "$out/bin/kcheckrunning"
wrapKDEProgram "$out/bin/systemmonitor"
wrapKDEProgram "$out/bin/kstartupconfig5"
wrapKDEProgram "$out/bin/startplasmacompositor"
wrapKDEProgram "$out/bin/kdostartupconfig5"
wrapKDEProgram "$out/bin/klipper"
wrapKDEProgram "$out/bin/kuiserver5"
wrapKDEProgram "$out/bin/krunner"
wrapKDEProgram "$out/bin/plasmashell"
wrapQtProgram "$out/bin/ksmserver"
wrapQtProgram "$out/bin/plasmawindowed"
wrapQtProgram "$out/bin/kcminit_startup"
wrapQtProgram "$out/bin/ksplashqml"
wrapQtProgram "$out/bin/kcheckrunning"
wrapQtProgram "$out/bin/systemmonitor"
wrapQtProgram "$out/bin/kstartupconfig5"
wrapQtProgram "$out/bin/startplasmacompositor"
wrapQtProgram "$out/bin/kdostartupconfig5"
wrapQtProgram "$out/bin/klipper"
wrapQtProgram "$out/bin/kuiserver5"
wrapQtProgram "$out/bin/krunner"
wrapQtProgram "$out/bin/plasmashell"
'';
}

View file

@ -1,6 +1,6 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews
, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem
, kxmlgui, kdbusaddons, kconfig, khtml, makeKDEWrapper
, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper
}:
plasmaPackage {
@ -8,7 +8,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
makeQtWrapper
];
buildInputs = [
kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
@ -16,6 +16,6 @@ plasmaPackage {
];
propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
postInstall = ''
wrapKDEProgram "$out/bin/systemsettings5"
wrapQtProgram "$out/bin/systemsettings5"
'';
}

View file

@ -1,11 +1,11 @@
{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
, kio, lmdb, makeKDEWrapper, qtbase, qtquick1, solid
, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
}:
kdeFramework {
name = "baloo";
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [
kconfig kcrash kdbusaddons lmdb qtquick1 solid
];
@ -13,11 +13,11 @@ kdeFramework {
kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
];
postInstall = ''
wrapKDEProgram "$out/bin/baloo_file"
wrapKDEProgram "$out/bin/baloo_file_extractor"
wrapKDEProgram "$out/bin/balooctl"
wrapKDEProgram "$out/bin/baloosearch"
wrapKDEProgram "$out/bin/balooshow"
wrapQtProgram "$out/bin/baloo_file"
wrapQtProgram "$out/bin/baloo_file_extractor"
wrapQtProgram "$out/bin/balooctl"
wrapQtProgram "$out/bin/baloosearch"
wrapQtProgram "$out/bin/balooshow"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -105,7 +105,6 @@ let
solid = callPackage ./solid.nix {};
sonnet = callPackage ./sonnet.nix {};
threadweaver = callPackage ./threadweaver.nix {};
makeKDEWrapper = callPackage ./make-kde-wrapper.nix { inherit makeSetupHook; };
};
newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope);

View file

@ -1,11 +1,11 @@
{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
, kio, kservice, kwindowsystem, kxmlgui, makeKDEWrapper, qtdeclarative
, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
}:
kdeFramework {
name = "kactivities";
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [
boost kcmutils kconfig kcoreaddons kdbusaddons kservice
kxmlgui
@ -14,7 +14,7 @@ kdeFramework {
kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
];
postInstall = ''
wrapKDEProgram "$out/bin/kactivitymanagerd"
wrapQtProgram "$out/bin/kactivitymanagerd"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,14 +1,14 @@
{ kdeFramework, lib
, extra-cmake-modules
, makeKDEWrapper
, makeQtWrapper
}:
kdeFramework {
name = "kconfig";
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
postInstall = ''
wrapKDEProgram "$out/bin/kreadconfig5"
wrapKDEProgram "$out/bin/kwriteconfig5"
wrapQtProgram "$out/bin/kreadconfig5"
wrapQtProgram "$out/bin/kwriteconfig5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,15 +1,15 @@
{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeKDEWrapper
, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
}:
kdeFramework {
name = "kconfigwidgets";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [ kguiaddons ];
propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
postInstall = ''
wrapKDEProgram "$out/bin/preparetips5"
wrapQtProgram "$out/bin/preparetips5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,15 +1,15 @@
{ kdeFramework, lib
, extra-cmake-modules
, makeKDEWrapper
, makeQtWrapper
, qtx11extras
}:
kdeFramework {
name = "kdbusaddons";
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
propagatedBuildInputs = [ qtx11extras ];
postInstall = ''
wrapKDEProgram "$out/bin/kquitapp5"
wrapQtProgram "$out/bin/kquitapp5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,12 +1,12 @@
{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
, kwidgetsaddons, kwindowsystem, makeKDEWrapper, pkgconfig
, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
, qtdeclarative
}:
kdeFramework {
name = "kdeclarative";
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [
epoxy kguiaddons kiconthemes kwidgetsaddons
];
@ -14,7 +14,7 @@ kdeFramework {
kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
];
postInstall = ''
wrapKDEProgram "$out/bin/kpackagelauncherqml"
wrapQtProgram "$out/bin/kpackagelauncherqml"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,5 +1,5 @@
{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
, docbook5_xsl, karchive, ki18n, makeKDEWrapper, perl, perlPackages
, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
}:
kdeFramework {
@ -7,7 +7,7 @@ kdeFramework {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive ];
propagatedBuildInputs = [ ki18n ];
propagatedNativeBuildInputs = [ makeKDEWrapper perl perlPackages.URI ];
propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"

View file

@ -5,17 +5,17 @@
, kcrash
, kdbusaddons
, kwindowsystem
, makeKDEWrapper
, makeQtWrapper
, qtx11extras
}:
kdeFramework {
name = "kglobalaccel";
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
propagatedBuildInputs = [ kwindowsystem qtx11extras ];
postInstall = ''
wrapKDEProgram "$out/bin/kglobalaccel5"
wrapQtProgram "$out/bin/kglobalaccel5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -2,13 +2,13 @@
, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
, kwidgetsaddons, kwindowsystem, kxmlgui, makeKDEWrapper
, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
, qtscript, qtx11extras, solid
}:
kdeFramework {
name = "kio";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [
acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
knotifications ktextwidgets kwallet kwidgetsaddons
@ -19,10 +19,10 @@ kdeFramework {
kservice kwindowsystem kxmlgui solid qtx11extras
];
postInstall = ''
wrapKDEProgram "$out/bin/kcookiejar5"
wrapKDEProgram "$out/bin/ktelnetservice5"
wrapKDEProgram "$out/bin/ktrash5"
wrapKDEProgram "$out/bin/kmailservice5"
wrapQtProgram "$out/bin/kcookiejar5"
wrapQtProgram "$out/bin/ktelnetservice5"
wrapQtProgram "$out/bin/ktrash5"
wrapQtProgram "$out/bin/kmailservice5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,14 +1,14 @@
{ kdeFramework, lib
, extra-cmake-modules
, kdoctools
, makeKDEWrapper
, makeQtWrapper
}:
kdeFramework {
name = "kjs";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
postInstall = ''
wrapKDEProgram "$out/bin/kjs5"
wrapQtProgram "$out/bin/kjs5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,15 +1,15 @@
{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
, makeKDEWrapper, qtsvg
, makeQtWrapper, qtsvg
}:
kdeFramework {
name = "kjsembed";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [ qtsvg ];
propagatedBuildInputs = [ ki18n kjs ];
postInstall = ''
wrapKDEProgram "$out/bin/kjscmd5"
wrapKDEProgram "$out/bin/kjsconsole"
wrapQtProgram "$out/bin/kjscmd5"
wrapQtProgram "$out/bin/kjsconsole"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -5,12 +5,12 @@
, kcoreaddons
, kdoctools
, ki18n
, makeKDEWrapper
, makeQtWrapper
}:
kdeFramework {
name = "kpackage";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [ karchive kconfig ];
propagatedBuildInputs = [ kcoreaddons ki18n ];
patches = [
@ -18,7 +18,7 @@ kdeFramework {
./0002-qdiriterator-follow-symlinks.patch
];
postInstall = ''
wrapKDEProgram "$out/bin/kpackagetool5"
wrapQtProgram "$out/bin/kpackagetool5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,19 +1,19 @@
{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeKDEWrapper
, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper
}:
kdeFramework {
name = "kwallet";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [
kconfig kcoreaddons kdbusaddons kiconthemes knotifications
kservice kwidgetsaddons libgcrypt
];
propagatedBuildInputs = [ ki18n kwindowsystem ];
postInstall = ''
wrapKDEProgram "$out/bin/kwalletd5"
wrapKDEProgram "$out/bin/kwallet-query"
wrapQtProgram "$out/bin/kwalletd5"
wrapQtProgram "$out/bin/kwallet-query"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,3 +0,0 @@
{ makeSetupHook, makeQtWrapper }:
makeSetupHook { deps = [ makeQtWrapper ]; } ./make-kde-wrapper.sh

View file

@ -1,13 +0,0 @@
makeKDEWrapper() {
local old="$1"
local new="$2"
shift
shift
makeQtWrapper "$old" "$new" "$@"
}
wrapKDEProgram() {
local prog="$1"
shift
wrapQtProgram "$prog" "$@"
}

View file

@ -2,12 +2,12 @@
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
, makeKDEWrapper, qtscript, qtx11extras
, makeQtWrapper, qtscript, qtx11extras
}:
kdeFramework {
name = "plasma-framework";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [
karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
kiconthemes knotifications kxmlgui qtscript
@ -17,7 +17,7 @@ kdeFramework {
qtx11extras
];
postInstall = ''
wrapKDEProgram "$out/bin/plasmapkg2"
wrapQtProgram "$out/bin/plasmapkg2"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,15 +1,15 @@
{ kdeFramework, lib
, extra-cmake-modules
, makeKDEWrapper
, makeQtWrapper
, qtdeclarative
}:
kdeFramework {
name = "solid";
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [ qtdeclarative ];
postInstall = ''
wrapKDEProgram "$out/bin/solid-hardware5"
wrapQtProgram "$out/bin/solid-hardware5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];