diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:05:22 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:05:22 +0200 |
| commit | 503081fa5be25e5054f490182a13f1c517e0664d (patch) | |
| tree | f1a5d09c71ff8fba0066b7d5481ed4b8da132ffa /pkgs/applications/kde | |
| parent | 9b09b832fc390b306611b6ec3bfffcc4452629fe (diff) | |
| parent | 52af1d0930732142937b8db6c28b7fcd16770a7c (diff) | |
| download | nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.gz nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.bz2 nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.lz nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.xz nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.zst nixlib-503081fa5be25e5054f490182a13f1c517e0664d.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/applications/kde')
| -rw-r--r-- | pkgs/applications/kde/kate.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/kde/konsole.nix | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index 95ff6cf198b2..f01a57a55d4d 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -15,8 +15,8 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ libgit2 ]; - propagatedBuildInputs = [ + buildInputs = [ + libgit2 kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 004fc1c37ae2..1be5b0b4a894 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, makeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, @@ -18,12 +18,7 @@ mkDerivation { kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff - makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/konsole --prefix XDG_DATA_DIRS ":" $out/share - ''; - propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } |