public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17435 from ttuegel/konsole-kpart

Browse Source 
Add missing Konsole kpart to various KDE applications
This commit is contained in:
Frederik Rietdijk 2016-08-02 09:13:15 +02:00 committed by GitHub
commit f7a48fb80e
3 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
pkgs/applications/editors/kile/frameworks.nix
View File

@ -1,9 +1,9 @@
{ stdenv { kdeDerivation
, lib , lib
, fetchgit , fetchgit
, extra-cmake-modules , ecm
, kdoctools , kdoctools
, makeQtWrapper , kdeWrapper
, qtscript , qtscript
, kconfig , kconfig
, kcrash , kcrash
@ -13,54 +13,55 @@
, kiconthemes , kiconthemes
, kinit , kinit
, khtml , khtml
, konsole
, kparts , kparts
, ktexteditor , ktexteditor
, kwindowsystem , kwindowsystem
, poppler , poppler
}: }:
stdenv.mkDerivation rec { let
name = "kile-${version}"; unwrapped =
version = "2016-07-02"; kdeDerivation rec {
name = "kile-${version}";
version = "2016-07-02";
src = fetchgit { src = fetchgit {
url = git://anongit.kde.org/kile.git; url = git://anongit.kde.org/kile.git;
rev = "d38bc7069667119cc891b351188484ca6fb88973"; rev = "d38bc7069667119cc891b351188484ca6fb88973";
sha256 = "1nha71i16fs7nq2812b5565nbmbsbs3ak5czas6xg1dg5bsvdqh8"; sha256 = "1nha71i16fs7nq2812b5565nbmbsbs3ak5czas6xg1dg5bsvdqh8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ ecm kdoctools ];
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [ buildInputs = [
qtscript kconfig
kconfig kcrash
kcrash kdbusaddons
kdbusaddons kdelibs4support
kdelibs4support kdoctools
kdoctools kguiaddons
kguiaddons kiconthemes
kiconthemes kinit
kinit khtml
khtml kparts
kparts ktexteditor
ktexteditor kwindowsystem
kwindowsystem poppler
poppler qtscript
]; ];
postInstall = '' meta = {
wrapQtProgram "$out/bin/kile" description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
''; homepage = https://www.kde.org/applications/office/kile/;
maintainers = with lib.maintainers; [ fridh ];
meta = { license = lib.licenses.gpl2Plus;
description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment"; };
homepage = https://www.kde.org/applications/office/kile/; };
maintainers = with lib.maintainers; [ fridh ]; in
license = lib.licenses.gpl2Plus; kdeWrapper unwrapped
}; {
targets = [ "bin/kile" ];
paths = [ konsole.unwrapped ];
} }

4
pkgs/desktops/kde-5/applications/dolphin.nix
View File

@ -4,7 +4,7 @@
baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils, baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
kparts, ktexteditor, kwindowsystem, phonon, solid konsole, kparts, ktexteditor, kwindowsystem, phonon, solid
}: }:
let let
@ -27,5 +27,5 @@ in
kdeWrapper unwrapped kdeWrapper unwrapped
{ {
targets = [ "bin/dolphin" ]; targets = [ "bin/dolphin" ];
paths = [ dolphin-plugins ]; paths = [ dolphin-plugins konsole.unwrapped ];
} }

14
pkgs/desktops/kde-5/applications/kate.nix
View File

@ -1,10 +1,10 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, ecm, kdoctools,
kactivities, kconfig, kcrash, kguiaddons, kiconthemes, ki18n, kinit, kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
kjobwidgets, kio, kparts, ktexteditor, kwindowsystem, kxmlgui, kdbusaddons, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
kwallet, plasma-framework, kitemmodels, knotifications, qtscript, kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
threadweaver, knewstuff, libgit2 plasma-framework, qtscript, threadweaver
}: }:
let let
@ -24,4 +24,8 @@ let
]; ];
}; };
in in
kdeWrapper unwrapped { targets = [ "bin/kate" "bin/kwrite" ]; } kdeWrapper unwrapped
{
targets = [ "bin/kate" "bin/kwrite" ];
paths = [ konsole.unwrapped ];
}