From 3ebbb328dbce4411e5c002240ad7a70cfc6fc300 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 8 Dec 2015 18:57:51 -0600 Subject: [PATCH] kf516: wrap new programs --- .../libraries/kde-frameworks-5.16/kcoreaddons.nix | 7 +++++-- .../libraries/kde-frameworks-5.16/kdesignerplugin.nix | 7 +++++-- .../libraries/kde-frameworks-5.16/kiconthemes.nix | 8 ++++++-- pkgs/development/libraries/kde-frameworks-5.16/kio.nix | 1 + 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix index 43c21bb51ef..f3a1db7bd48 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix @@ -1,12 +1,15 @@ -{ kdeFramework, lib +{ kdeFramework, lib, makeQtWrapper , extra-cmake-modules , shared_mime_info }: kdeFramework { name = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ shared_mime_info ]; + postInstall = '' + wrapQtProgram "$out/bin/desktoptojson" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix index 28df2415320..cbc114ccca0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib +{ kdeFramework, lib, makeQtWrapper , extra-cmake-modules , kcompletion , kconfig @@ -18,13 +18,16 @@ kdeFramework { name = "kdesignerplugin"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui ]; propagatedBuildInputs = [ kio sonnet ]; + postInstall = '' + wrapQtProgram "$out/bin/kgendesignerplugin" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix index 02b516afedc..eb24403169d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix @@ -1,12 +1,16 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n +{ kdeFramework, lib, makeQtWrapper +, extra-cmake-modules, kconfigwidgets, ki18n , kitemviews, qtsvg }: kdeFramework { name = "kiconthemes"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ kconfigwidgets kitemviews qtsvg ]; propagatedBuildInputs = [ ki18n ]; + postInstall = '' + wrapQtProgram "$out/bin/kiconfinder5" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix b/pkgs/development/libraries/kde-frameworks-5.16/kio.nix index 0789828d812..199565e2418 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kio.nix @@ -23,6 +23,7 @@ kdeFramework { wrapQtProgram "$out/bin/ktelnetservice5" wrapQtProgram "$out/bin/ktrash5" wrapQtProgram "$out/bin/kmailservice5" + wrapQtProgram "$out/bin/protocoltojson" ''; meta = { maintainers = [ lib.maintainers.ttuegel ];