diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-24 18:54:32 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-24 18:54:32 -0500 |
commit | 73061742af6f8731543890044d2697ab56dc2cbc (patch) | |
tree | 16fecd6aff968241de5d71e6b8585134915d9470 /pkgs/applications/kde | |
parent | dffba878e135960d14f12392a52eb24194539dd7 (diff) | |
parent | e08a891d34b1be533196b171d7995efbc69353e0 (diff) | |
download | nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.gz nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.bz2 nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.lz nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.xz nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.zst nixlib-73061742af6f8731543890044d2697ab56dc2cbc.zip |
Merge remote-tracking branch 'NixOS/master' into staging
Diffstat (limited to 'pkgs/applications/kde')
-rw-r--r-- | pkgs/applications/kde/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/kde/kmplot.nix | 15 | ||||
-rw-r--r-- | pkgs/applications/kde/ktouch.nix | 5 |
3 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 0822e65c7c0c..b9b318e75c3e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -124,6 +124,7 @@ let kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; kmix = callPackage ./kmix.nix {}; + kmplot = callPackage ./kmplot.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix new file mode 100644 index 000000000000..c0c00f213400 --- /dev/null +++ b/pkgs/applications/kde/kmplot.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools +, kcrash, kguiaddons, ki18n, kparts, kwidgetsaddons, kdbusaddons +}: + +mkDerivation { + name = "kmplot"; + meta = { + license = with lib.licenses; [ gpl2Plus fdl12 ]; + maintainers = [ lib.maintainers.orivej ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcrash kguiaddons ki18n kparts kwidgetsaddons kdbusaddons + ]; +} diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix index 75e72c0ba180..64179f2e64dc 100644 --- a/pkgs/applications/kde/ktouch.nix +++ b/pkgs/applications/kde/ktouch.nix @@ -3,7 +3,7 @@ , kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n , kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons , kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts -, qtx11extras, qtgraphicaleffects, xorg +, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg }: @@ -19,7 +19,8 @@ kconfig kconfigwidgets kcoreaddons kdeclarative ki18n kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts - qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb + qtx11extras qtgraphicaleffects qtxmlpatterns + xorg.libxkbfile xorg.libxcb ]; enableParallelBuilding = true; |