mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Code Issues Wiki Activity

Remove kdeWrapper

Browse source
This commit is contained in:
Thomas Tuegel 2017-05-16 10:56:41 -05:00
parent 945758f960
commit be7b7d908f
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
44 changed files with 665 additions and 987 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -7,7 +7,7 @@ let
xcfg = config.services.xserver; xcfg = config.services.xserver;
cfg = xcfg.desktopManager.plasma5; cfg = xcfg.desktopManager.plasma5;
inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg; inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
in in
@ -30,24 +30,12 @@ in
''; '';
}; };
extraPackages = mkOption {
type = types.listOf types.package;
default = [];
description = ''
KDE packages that need to be installed system-wide.
'';
};
}; };
}; };
config = mkMerge [ config = mkMerge [
(mkIf (cfg.extraPackages != []) {
environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ];
})
(mkIf (xcfg.enable && cfg.enable) { (mkIf (xcfg.enable && cfg.enable) {
services.xserver.desktopManager.session = singleton { services.xserver.desktopManager.session = singleton {
name = "plasma5"; name = "plasma5";
@ -139,10 +127,14 @@ in
plasma-workspace plasma-workspace
plasma-workspace-wallpapers plasma-workspace-wallpapers
dolphin
dolphin-plugins dolphin-plugins
ffmpegthumbs ffmpegthumbs
kdegraphics-thumbnailers kdegraphics-thumbnailers
khelpcenter
kio-extras kio-extras
konsole
oxygen
print-manager print-manager
breeze-icons breeze-icons
@ -163,16 +155,6 @@ in
++ lib.optional config.services.colord.enable colord-kde ++ lib.optional config.services.colord.enable colord-kde
++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]; ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
services.xserver.desktopManager.plasma5.extraPackages =
with kdeApplications; with plasma5;
[
khelpcenter
oxygen
dolphin
konsole
];
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
environment.etc = singleton { environment.etc = singleton {

22
pkgs/applications/editors/kdevelop5/kdevelop.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper { mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, wrapGAppsHook
, qtquickcontrols, qtwebkit, qttools, kde-cli-tools , qtquickcontrols, qtwebkit, qttools, kde-cli-tools
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
@ -12,7 +12,7 @@ let
version = "5.1.1"; version = "5.1.1";
in in
stdenv.mkDerivation rec { mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
@ -21,24 +21,26 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper cmake gettext pkgconfig extra-cmake-modules makeWrapper wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
kdevelop-pg-qt
llvmPackages.llvm llvmPackages.clang-unwrapped
];
propagatedBuildInputs = [
qtquickcontrols qtwebkit qtquickcontrols qtwebkit
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
kdevplatform kdevelop-pg-qt shared_mime_info libksysguard konsole.unwrapped kdevplatform shared_mime_info libksysguard konsole
llvmPackages.llvm llvmPackages.clang-unwrapped
]; ];
postInstall = '' postInstall = ''
wrapQtProgram "$out/bin/kdevelop"
# The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin" wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin"
# Fix the (now wrapped) kdevelop! to find things in right places: # Fix the (now wrapped) kdevelop! to find things in right places:
# - Make KDEV_BASEDIR point to bin directory of kdevplatform. # - Make KDEV_BASEDIR point to bin directory of kdevplatform.
kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|" kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|"
@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped" sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped"
''; '';
meta = with stdenv.lib; { meta = with lib; {
maintainers = [ maintainers.ambrop72 ]; maintainers = [ maintainers.ambrop72 ];
platforms = platforms.linux; platforms = platforms.linux;
description = "KDE official IDE"; description = "KDE official IDE";
@ -60,6 +62,6 @@ stdenv.mkDerivation rec {
libraries and is under development since 1998. libraries and is under development since 1998.
''; '';
homepage = https://www.kdevelop.org; homepage = https://www.kdevelop.org;
license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; license = with licenses; [ gpl2Plus lgpl2Plus ];
}; };
} }

77
pkgs/applications/editors/kile/default.nix
View file

@ -3,7 +3,7 @@
, fetchgit , fetchgit
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
, kdeWrapper , wrapGAppsHook
, qtscript , qtscript
, kconfig , kconfig
, kcrash , kcrash
@ -21,50 +21,43 @@
, poppler , poppler
}: }:
let mkDerivation rec {
unwrapped = name = "kile-${version}";
mkDerivation rec { version = "2017-02-09";
name = "kile-${version}";
version = "2017-02-09";
src = fetchgit { src = fetchgit {
url = git://anongit.kde.org/kile.git; url = git://anongit.kde.org/kile.git;
rev = "f77f6e627487c152f111e307ad6dc71699ade746"; rev = "f77f6e627487c152f111e307ad6dc71699ade746";
sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib"; sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
buildInputs = [ propagatedBuildInputs = [
kconfig kconfig
kcrash kcrash
kdbusaddons kdbusaddons
kdelibs4support kdelibs4support
kdoctools kdoctools
kguiaddons kguiaddons
kiconthemes kiconthemes
kinit kinit
khtml khtml
kparts kparts
ktexteditor ktexteditor
kwindowsystem kwindowsystem
okular.unwrapped okular
poppler poppler
qtscript qtscript
]; ];
meta = { propagatedUserEnvPkgs = [ konsole ];
description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
homepage = https://www.kde.org/applications/office/kile/; meta = {
maintainers = with lib.maintainers; [ fridh ]; description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
license = lib.licenses.gpl2Plus; homepage = https://www.kde.org/applications/office/kile/;
}; maintainers = with lib.maintainers; [ fridh ];
}; license = lib.licenses.gpl2Plus;
in };
kdeWrapper
{
inherit unwrapped;
targets = [ "bin/kile" ];
paths = [ konsole.unwrapped okular.unwrapped ];
} }

57
pkgs/applications/graphics/digikam/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper { mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree` # For `digitaglinktree`
, perl, sqlite , perl, sqlite
@ -44,7 +44,7 @@
, oxygen , oxygen
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
name = "digikam-${version}"; name = "digikam-${version}";
version = "5.4.0"; version = "5.4.0";
@ -53,26 +53,11 @@ stdenv.mkDerivation rec {
sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg"; sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ]; nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ];
patches = [ ./0001-Disable-fno-operator-names.patch ]; patches = [ ./0001-Disable-fno-operator-names.patch ];
buildInputs = [ buildInputs = [
qtbase
qtxmlpatterns
qtsvg
qtwebkit
kconfigwidgets
kcoreaddons
kdoctools
kfilemetadata
knotifications
knotifyconfig
ktextwidgets
kwidgetsaddons
kxmlgui
bison bison
boost boost
eigen eigen
@ -86,12 +71,28 @@ stdenv.mkDerivation rec {
liblqr1 liblqr1
libqtav libqtav
libusb1 libusb1
marble.unwrapped
mysql mysql
opencv opencv
threadweaver ];
propagatedBuildInputs = [
qtbase
qtxmlpatterns
qtsvg
qtwebkit
kconfigwidgets
kcoreaddons
kfilemetadata
knotifications
knotifyconfig
ktextwidgets
kwidgetsaddons
kxmlgui
marble
oxygen oxygen
threadweaver
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -104,22 +105,18 @@ stdenv.mkDerivation rec {
"-DENABLE_MEDIAPLAYER=1" "-DENABLE_MEDIAPLAYER=1"
]; ];
fixupPhase = '' preFixup = ''
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
substituteInPlace $out/bin/digitaglinktree \ substituteInPlace $out/bin/digitaglinktree \
--replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/perl" "${perl}/bin/perl" \
--replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
wrapQtProgram $out/bin/digikam \
--prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"
wrapQtProgram $out/bin/showfoto
''; '';
meta = { meta = with lib; {
description = "Photo Management Program"; description = "Photo Management Program";
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
homepage = http://www.digikam.org; homepage = http://www.digikam.org;
maintainers = with stdenv.lib.maintainers; [ the-kenny ]; maintainers = with maintainers; [ the-kenny ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

57
pkgs/applications/kde/ark/default.nix
View file

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, config, kdeWrapper, mkDerivation, lib, config, wrapGAppsHook,
extra-cmake-modules, kdoctools, makeWrapper, extra-cmake-modules, kdoctools,
karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio, karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
kservice, kpty, kwidgetsaddons, libarchive, kitemmodels, kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
@ -13,35 +13,26 @@
unfreeEnableUnrar ? false, unrar, unfreeEnableUnrar ? false, unrar,
}: }:
let mkDerivation {
unwrapped = name = "ark";
mkDerivation { nativeBuildInputs = [
name = "ark"; extra-cmake-modules kdoctools wrapGAppsHook
nativeBuildInputs = [ ];
extra-cmake-modules kdoctools makeWrapper propagatedBuildInputs = [
]; khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
propagatedBuildInputs = [ kpty kwidgetsaddons libarchive kitemmodels
khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice ];
kpty kwidgetsaddons libarchive kitemmodels preFixup =
]; let
postInstall = PATH =
let lib.makeBinPath
PATH = ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
lib.makeBinPath in ''
([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar); gappsWrapperArgs+=(--prefix PATH : "${PATH}")
in '' '';
wrapProgram "$out/bin/ark" \ meta = {
--prefix PATH : "${PATH}" license = with lib.licenses;
''; [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
meta = { maintainers = [ lib.maintainers.ttuegel ];
license = with lib.licenses; };
[ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
maintainers = [ lib.maintainers.ttuegel ];
};
};
in
kdeWrapper
{
inherit unwrapped;
targets = [ "bin/ark" ];
} }

2
pkgs/applications/kde/dolphin-plugins.nix
View file

@ -12,6 +12,6 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
dolphin.unwrapped kdelibs4support ki18n kio kxmlgui dolphin kdelibs4support ki18n kio kxmlgui
]; ];
} }

39
pkgs/applications/kde/dolphin.nix
View file

@ -1,32 +1,23 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, makeQtWrapper, extra-cmake-modules, kdoctools,
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,
konsole, kparts, ktexteditor, kwindowsystem, phonon, solid konsole, kparts, ktexteditor, kwindowsystem, phonon, solid
}: }:
let mkDerivation {
unwrapped = name = "dolphin";
mkDerivation { meta = {
name = "dolphin"; license = with lib.licenses; [ gpl2 fdl12 ];
meta = { maintainers = [ lib.maintainers.ttuegel ];
license = with lib.licenses; [ gpl2 fdl12 ]; };
maintainers = [ lib.maintainers.ttuegel ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
}; propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
propagatedBuildInputs = [ kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes phonon solid
kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem ];
phonon solid
];
};
in
kdeWrapper
{
inherit unwrapped;
targets = [ "bin/dolphin" ];
paths = [ dolphin-plugins konsole.unwrapped ];
} }

31
pkgs/applications/kde/filelight.nix
View file

@ -1,24 +1,17 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kio, kparts, kxmlgui, qtscript, solid kio, kparts, kxmlgui, qtscript, solid
}: }:
let mkDerivation {
unwrapped = name = "filelight";
mkDerivation { meta = {
name = "filelight"; license = with lib.licenses; [ gpl2 ];
meta = { maintainers = with lib.maintainers; [ fridh vcunat ];
license = with lib.licenses; [ gpl2 ]; };
maintainers = with lib.maintainers; [ fridh vcunat ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; kio kparts kxmlgui qtscript solid
propagatedBuildInputs = [ ];
kio kparts kxmlgui qtscript solid
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/filelight" ];
} }

35
pkgs/applications/kde/gwenview.nix
View file

@ -1,27 +1,20 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2, baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
}: }:
let mkDerivation {
unwrapped = name = "gwenview";
mkDerivation { meta = {
name = "gwenview"; license = with lib.licenses; [ gpl2 fdl12 ];
meta = { maintainers = [ lib.maintainers.ttuegel ];
license = with lib.licenses; [ gpl2 fdl12 ]; };
maintainers = [ lib.maintainers.ttuegel ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
propagatedBuildInputs = [ libkipi phonon qtimageformats qtsvg qtx11extras
baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw ];
libkipi phonon qtimageformats qtsvg qtx11extras propagatedUserEnvPkgs = [ kipi-plugins ];
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/gwenview" ];
paths = [ kipi-plugins ];
} }

63
pkgs/applications/kde/k3b.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, kdeWrapper, extra-cmake-modules { mkDerivation, lib, wrapGAppsHook, extra-cmake-modules
, qtwebkit , qtwebkit
, libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
, flac, lame, libmad, libmpcdec, libvorbis , flac, lame, libmad, libmpcdec, libvorbis
@ -7,35 +7,34 @@
, ffmpeg, libmusicbrainz2, normalize, sox, transcode , ffmpeg, libmusicbrainz2, normalize, sox, transcode
}: }:
let mkDerivation {
unwrapped = name = "k3b";
mkDerivation { meta = with lib; {
name = "k3b"; license = with licenses; [ gpl2Plus ];
meta = with lib; { maintainers = with maintainers; [ sander phreedom ];
license = with licenses; [ gpl2Plus ]; platforms = platforms.linux;
maintainers = with maintainers; [ sander phreedom ]; };
platforms = platforms.linux; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; # qt
propagatedBuildInputs = [ qtwebkit
# qt # kde
qtwebkit libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
# kde # formats
libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui flac lame libmad libmpcdec libvorbis
# formats # sound utilities
flac lame libmad libmpcdec libvorbis libsamplerate libsndfile taglib
# sound utilities # cd/dvd
libsamplerate libsndfile taglib cdparanoia libdvdcss libdvdread
# cd/dvd # others
cdparanoia libdvdcss libdvdread ffmpeg libmusicbrainz2
# others ];
ffmpeg libmusicbrainz2 preFixup =
]; let k3bPath = lib.makeBinPath [
enableParallelBuilding = true; cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
}; vcdimager
];
in kdeWrapper { in ''
inherit unwrapped; gappsWrapperArgs+=(--prefix PATH : "${k3bPath}")
targets = [ "bin/k3b" ]; '';
paths = [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode vcdimager ];
} }

40
pkgs/applications/kde/kate.nix
View file

@ -1,32 +1,24 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n, kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2, kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
plasma-framework, qtscript, threadweaver plasma-framework, qtscript, threadweaver
}: }:
let mkDerivation {
unwrapped = name = "kate";
mkDerivation { meta = {
name = "kate"; license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
meta = { maintainers = [ lib.maintainers.ttuegel ];
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; };
maintainers = [ lib.maintainers.ttuegel ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
propagatedBuildInputs = [ qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
kactivities ki18n kio ktexteditor kwindowsystem plasma-framework kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts knewstuff libgit2
kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver ];
knewstuff libgit2 propagatedUserEnvPkgs = [ konsole ];
];
};
in
kdeWrapper
{
inherit unwrapped;
targets = [ "bin/kate" "bin/kwrite" ];
paths = [ konsole.unwrapped ];
} }

34
pkgs/applications/kde/kcachegrind.nix
View file

@ -1,28 +1,20 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kio, ki18n, kio, ki18n,
perl, python, php perl, python, php
}: }:
kdeWrapper { mkDerivation {
unwrapped = mkDerivation { name = "kcachegrind";
name = "kcachegrind"; meta = {
meta = { license = with lib.licenses; [ gpl2 ];
license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ orivej ];
maintainers = with lib.maintainers; [ orivej ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ perl python php kio ki18n ];
enableParallelBuilding = true;
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
targets = [ propagatedBuildInputs = [ kio ];
"bin/kcachegrind" buildInputs = [ perl python php ki18n ];
"bin/dprof2calltree" # perl preFixup = ''
"bin/hotshot2calltree" # python gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ perl php python]}")
"bin/memprof2calltree" # perl '';
"bin/op2calltree" # perl
"bin/pprof2calltree" # php
];
} }

32
pkgs/applications/kde/kcalc.nix
View file

@ -1,24 +1,18 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
}: }:
let mkDerivation {
unwrapped = name = "kcalc";
mkDerivation { meta = {
name = "kcalc"; license = with lib.licenses; [ gpl2 ];
meta = { maintainers = [ lib.maintainers.fridh ];
license = with lib.licenses; [ gpl2 ]; };
maintainers = [ lib.maintainers.fridh ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; buildInputs = [ gmp ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [
propagatedBuildInputs = [ kconfig kconfigwidgets kguiaddons kinit knotifications
gmp kconfig kconfigwidgets kguiaddons kinit knotifications ];
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/kcalc" ];
} }

29
pkgs/applications/kde/kcolorchooser.nix
View file

@ -1,21 +1,16 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui extra-cmake-modules, wrapGAppsHook,
ki18n, kwidgetsaddons, kxmlgui
}: }:
let mkDerivation {
unwrapped = name = "kcolorchooser";
mkDerivation { meta = {
name = "kcolorchooser"; license = with lib.licenses; [ mit ];
meta = { maintainers = [ lib.maintainers.ttuegel ];
license = with lib.licenses; [ mit ]; };
maintainers = [ lib.maintainers.ttuegel ]; nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
}; buildInputs = [ ki18n ];
nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/kcolorchooser" ];
} }

5
pkgs/applications/kde/kcontacts.nix
View file

@ -10,6 +10,7 @@ mkDerivation {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ extra-cmake-modules ki18n ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kconfig kcodecs ]; buildInputs = [ ki18n ];
propagatedBuildInputs = [ kcoreaddons kconfig kcodecs ];
} }

27
pkgs/applications/kde/kdenlive.nix
View file

@ -1,8 +1,8 @@
{ mkDerivation { mkDerivation
, kdeWrapper
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
, wrapGAppsHook
, qtscript , qtscript
, kactivities , kactivities
, kconfig , kconfig
@ -31,8 +31,7 @@
, qtquickcontrols , qtquickcontrols
}: }:
let mkDerivation {
unwrapped = mkDerivation {
name = "kdenlive"; name = "kdenlive";
patches = [ patches = [
./kdenlive-cmake-concurrent-module.patch ./kdenlive-cmake-concurrent-module.patch
@ -40,6 +39,7 @@ unwrapped = mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules
kdoctools kdoctools
wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
qtscript qtscript
@ -61,25 +61,12 @@ unwrapped = mkDerivation {
ffmpeg ffmpeg
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kactivities kactivities kconfig kcrash kguiaddons kiconthemes kinit kio kio-extras
ki18n kdbusaddons kfilemetadata knotifications knewstuff karchive knotifyconfig
kio kplotting ktextwidgets kwindowsystem plasma-framework
kio-extras phonon-backend-gstreamer qtquickcontrols shared_mime_info
kwindowsystem
kfilemetadata
plasma-framework
phonon-backend-gstreamer
qtquickcontrols
]; ];
enableParallelBuilding = true;
meta = { meta = {
license = with lib.licenses; [ gpl2Plus ]; license = with lib.licenses; [ gpl2Plus ];
}; };
};
in
kdeWrapper
{
inherit unwrapped;
targets = [ "bin/kdenlive" ];
paths = [ kinit ];
} }

29
pkgs/applications/kde/kdf.nix
View file

@ -1,24 +1,15 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kcmutils kcmutils
}: }:
let mkDerivation {
unwrapped = name = "kdf";
mkDerivation { meta = {
name = "kdf"; license = with lib.licenses; [ gpl2 ];
meta = { maintainers = [ lib.maintainers.peterhoeg ];
license = with lib.licenses; [ gpl2 ]; };
maintainers = [ lib.maintainers.peterhoeg ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; propagatedBuildInputs = [ kcmutils ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcmutils
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/kdf" ];
} }

12
pkgs/applications/kde/kgpg.nix
View file

@ -1,6 +1,6 @@
{ {
mkDerivation, lib, makeQtWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, ki18n, extra-cmake-modules, kdoctools, ki18n, wrapGAppsHook,
akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
@ -8,14 +8,14 @@
mkDerivation { mkDerivation {
name = "kgpg"; name = "kgpg";
nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n wrapGAppsHook ];
buildInputs = [ buildInputs = [
akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
kwidgetsaddons kwindowsystem makeQtWrapper kwidgetsaddons kwindowsystem
]; ];
postInstall = '' preFixup = ''
wrapQtProgram $out/bin/kgpg --suffix PATH : ${lib.makeBinPath [ gnupg1 ]} gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gnupg1 ]})
''; '';
meta = { meta = {
license = [ lib.licenses.gpl2 ]; license = [ lib.licenses.gpl2 ];

25
pkgs/applications/kde/khelpcenter.nix
View file

@ -1,22 +1,15 @@
{ {
mkDerivation, kdeWrapper, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
kdelibs4support, khtml, kservice, xapian kdelibs4support, khtml, kservice, xapian
}: }:
let mkDerivation {
unwrapped = name = "khelpcenter";
mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
name = "khelpcenter"; buildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
buildInputs = [ kinit kcmutils kservice xapian
grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons ];
kinit kcmutils kservice xapian
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/khelpcenter" ];
} }

32
pkgs/applications/kde/kig.nix
View file

@ -1,26 +1,18 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kparts, qtsvg, qtxmlpatterns, ktexteditor, boost kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
}: }:
let mkDerivation {
unwrapped = name = "kig";
mkDerivation { meta = {
name = "kig"; license = with lib.licenses; [ gpl2 ];
meta = { maintainers = with lib.maintainers; [ raskin ];
license = with lib.licenses; [ gpl2 ]; };
maintainers = with lib.maintainers; [ raskin ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; buildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; kparts qtsvg qtxmlpatterns ktexteditor boost
buildInputs = [ ];
kparts qtsvg qtxmlpatterns ktexteditor boost
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/kig" ];
} }

41
pkgs/applications/kde/kmix.nix
View file

@ -1,30 +1,23 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support, kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
plasma-framework, libpulseaudio, alsaLib, libcanberra_kde plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
}: }:
let mkDerivation {
unwrapped = name = "kmix";
mkDerivation { meta = {
name = "kmix"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
meta = { maintainers = [ lib.maintainers.rongcuid ];
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; };
maintainers = [ lib.maintainers.rongcuid ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [
buildInputs = [ libpulseaudio alsaLib libcanberra_kde ]; kglobalaccel kxmlgui kcoreaddons kdelibs4support
propagatedBuildInputs = [ plasma-framework
kglobalaccel kxmlgui kcoreaddons kdelibs4support ];
plasma-framework cmakeFlags = [
]; "-DKMIX_KF5_BUILD=1"
cmakeFlags = [ ];
"-DKMIX_KF5_BUILD=1"
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/kmix" ];
} }

28
pkgs/applications/kde/kolourpaint.nix
View file

@ -1,28 +1,18 @@
{ lib { lib
, mkDerivation , mkDerivation
, kdeWrapper
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
, wrapGAppsHook
, kdelibs4support , kdelibs4support
, libkexiv2 , libkexiv2
}: }:
let mkDerivation {
unwrapped = name = "kolourpaint";
mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
name = "kolourpaint"; propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; meta = {
propagatedBuildInputs = [ maintainers = [ lib.maintainers.fridh ];
kdelibs4support license = with lib.licenses; [ gpl2 ];
libkexiv2 };
];
meta = {
maintainers = [ lib.maintainers.fridh ];
license = with lib.licenses; [ gpl2 ];
};
};
in kdeWrapper {
inherit unwrapped;
targets = ["bin/kolourpaint"];
} }

25
pkgs/applications/kde/kompare.nix
View file

@ -1,21 +1,14 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kparts, ktexteditor, kwidgetsaddons, libkomparediff2 kparts, ktexteditor, kwidgetsaddons, libkomparediff2
}: }:
let mkDerivation {
unwrapped = name = "kompare";
mkDerivation { meta = { license = with lib.licenses; [ gpl2 ]; };
name = "kompare"; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
meta = { license = with lib.licenses; [ gpl2 ]; }; propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; kparts ktexteditor kwidgetsaddons libkomparediff2
propagatedBuildInputs = [ ];
kparts ktexteditor kwidgetsaddons libkomparediff2
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/kompare" ];
} }

37
pkgs/applications/kde/konsole.nix
View file

@ -1,30 +1,23 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
kwindowsystem, kxmlgui, qtscript kwindowsystem, kxmlgui, qtscript
}: }:
let mkDerivation {
unwrapped = name = "konsole";
mkDerivation { meta = {
name = "konsole"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
meta = { maintainers = [ lib.maintainers.ttuegel ];
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; };
maintainers = [ lib.maintainers.ttuegel ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
propagatedBuildInputs = [ kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion knotifications knotifyconfig kparts kpty kservice ktextwidgets
kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio kwidgetsaddons kxmlgui
knotifications knotifyconfig kparts kpty kservice ktextwidgets ];
kwidgetsaddons kxmlgui
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/konsole" ];
} }

27
pkgs/applications/kde/krfb.nix
View file

@ -1,22 +1,15 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kdelibs4support, kdnssd, libvncserver, libXtst kdelibs4support, kdnssd, libvncserver, libXtst
}: }:
let mkDerivation {
unwrapped = name = "krfb";
mkDerivation { meta = {
name = "krfb"; license = with lib.licenses; [ gpl2 fdl12 ];
meta = { maintainers = with lib.maintainers; [ jerith666 ];
license = with lib.licenses; [ gpl2 fdl12 ]; };
maintainers = with lib.maintainers; [ jerith666 ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/krfb" ];
} }

32
pkgs/applications/kde/kwalletmanager.nix
View file

@ -1,8 +1,8 @@
{ lib { lib
, mkDerivation , mkDerivation
, kdeWrapper
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
, wrapGAppsHook
, kauth , kauth
, kcmutils , kcmutils
, kconfigwidgets , kconfigwidgets
@ -12,25 +12,15 @@
, kxmlgui , kxmlgui
}: }:
let mkDerivation {
unwrapped = mkDerivation { name = "kwalletmanager";
name = "kwalletmanager"; meta = {
meta = { license = with lib.licenses; [ gpl2 ];
license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh ];
maintainers = with lib.maintainers; [ fridh ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kauth
kcmutils
kconfigwidgets
kcoreaddons
kdbusaddons
kdelibs4support
kxmlgui
];
}; };
in kdeWrapper { nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
inherit unwrapped; propagatedBuildInputs = [
targets = ["bin/kwalletmanager5"]; kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
kxmlgui
];
} }

32
pkgs/applications/kde/marble.nix
View file

@ -1,28 +1,16 @@
{ mkDerivation, lib, kdeWrapper { mkDerivation, lib
, extra-cmake-modules, kdoctools , extra-cmake-modules, kdoctools, wrapGAppsHook
, qtscript, qtsvg, qtquickcontrols, qtwebkit , qtscript, qtsvg, qtquickcontrols, qtwebkit
, krunner, shared_mime_info, kparts, knewstuff , krunner, shared_mime_info, kparts, knewstuff
, gpsd, perl , gpsd, perl
}: }:
let mkDerivation {
unwrapped = name = "marble";
mkDerivation { meta.license = with lib.licenses; [ lgpl21 gpl3 ];
name = "marble"; nativeBuildInputs = [ extra-cmake-modules kdoctools perl wrapGAppsHook ];
meta.license = with lib.licenses; [ lgpl21 gpl3 ]; propagatedBuildInputs = [
qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; knewstuff gpsd
propagatedBuildInputs = [ ];
qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info
krunner kparts knewstuff
gpsd
];
enableParallelBuilding = true;
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/marble-qt" "bin/marble" ];
paths = [ unwrapped ];
} }

33
pkgs/applications/kde/okteta.nix
View file

@ -1,26 +1,19 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kinit, kconfig, kinit,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5 kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
}: }:
let mkDerivation {
unwrapped = name = "okteta";
mkDerivation { meta = {
name = "okteta"; license = with lib.licenses; [ gpl2 ];
meta = { maintainers = with lib.maintainers; [ peterhoeg ];
license = with lib.licenses; [ gpl2 ]; };
maintainers = with lib.maintainers; [ peterhoeg ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
}; propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; kconfig kinit
propagatedBuildInputs = [ kcmutils kconfigwidgets knewstuff kparts qca-qt5
kconfig kinit ];
kcmutils kconfigwidgets knewstuff kparts qca-qt5
];
};
in kdeWrapper {
inherit unwrapped;
targets = [ "bin/okteta" ];
} }

38
pkgs/applications/kde/okular.nix
View file

@ -1,31 +1,25 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
}: }:
let mkDerivation {
unwrapped = mkDerivation { name = "okular";
name = "okular"; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [
propagatedBuildInputs = [ djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler qca-qt5 qtdeclarative qtsvg threadweaver
qca-qt5 qtdeclarative qtsvg threadweaver ];
]; meta = {
meta = { platforms = lib.platforms.linux;
platforms = lib.platforms.linux; homepage = "http://www.kde.org";
homepage = "http://www.kde.org"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ];
maintainers = [ lib.maintainers.ttuegel ];
};
}; };
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/okular" ];
} }

4
pkgs/applications/kde/print-manager.nix
View file

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, extra-cmake-modules, mkDerivation, lib, extra-cmake-modules, wrapGAppsHook,
cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio, cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework, knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
qtdeclarative qtdeclarative
@ -11,7 +11,7 @@ mkDerivation {
license = [ lib.licenses.gpl2 ]; license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
propagatedBuildInputs = [ propagatedBuildInputs = [
cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework

29
pkgs/applications/kde/spectacle.nix
View file

@ -1,25 +1,18 @@
{ {
mkDerivation, lib, kdeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins, kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
xcb-util-cursor xcb-util-cursor
}: }:
let mkDerivation {
unwrapped = name = "spectacle";
mkDerivation { meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
name = "spectacle"; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
propagatedBuildInputs = [ kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications ];
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor propagatedUserEnvPkgs = [ kipi-plugins ];
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/spectacle" ];
paths = [ kipi-plugins ];
} }

45
pkgs/applications/misc/krename/default.nix
View file

@ -1,35 +1,30 @@
{ {
mkDerivation, kdeWrapper, fetchFromGitHub, lib, mkDerivation, fetchFromGitHub, lib,
extra-cmake-modules, kdoctools, kconfig, kinit, kjsembed, extra-cmake-modules, kdoctools, wrapGAppsHook,
taglib, exiv2, podofo kconfig, kinit, kjsembed, taglib, exiv2, podofo
}: }:
let let
pname = "krename"; pname = "krename";
version = "20170610"; version = "20170610";
unwrapped = mkDerivation rec { in mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KDE"; owner = "KDE";
repo = "krename"; repo = "krename";
rev = "18000edfec52de0b417d575e14eb078b4bd7b2f3"; rev = "18000edfec52de0b417d575e14eb078b4bd7b2f3";
sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j"; sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j";
};
meta = with lib; {
homepage = http://www.krename.net;
description = "A powerful batch renamer for KDE";
inherit (kconfig.meta) platforms;
maintainers = with maintainers; [ peterhoeg ];
};
buildInputs = [ taglib exiv2 podofo ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kconfig kinit kjsembed ];
}; };
in kdeWrapper { meta = with lib; {
inherit unwrapped; homepage = http://www.krename.net;
targets = [ "bin/krename" ]; description = "A powerful batch renamer for KDE";
inherit (kconfig.meta) platforms;
maintainers = with maintainers; [ peterhoeg ];
};
buildInputs = [ taglib exiv2 podofo ];
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kinit kjsembed ];
} }

37
pkgs/applications/misc/krusader/default.nix
View file

@ -1,32 +1,27 @@
{ {
mkDerivation, kdeWrapper, fetchurl, lib, mkDerivation, fetchurl, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kinit, kparts kconfig, kinit, kparts
}: }:
let let
pname = "krusader"; pname = "krusader";
version = "2.6.0"; version = "2.6.0";
unwrapped = mkDerivation rec { in mkDerivation rec {
name = "krusader-${version}"; name = "krusader-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh"; sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
};
meta = with lib; {
description = "Norton/Total Commander clone for KDE";
license = licenses.gpl2;
homepage = http://www.krusader.org;
maintainers = with maintainers; [ sander ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kconfig kinit kparts ];
}; };
in kdeWrapper { meta = with lib; {
inherit unwrapped; description = "Norton/Total Commander clone for KDE";
targets = [ "bin/krusader" ]; license = licenses.gpl2;
homepage = http://www.krusader.org;
maintainers = with maintainers; [ sander ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kinit kparts ];
} }

45
pkgs/applications/misc/latte-dock/default.nix
View file

@ -1,33 +1,26 @@
{ stdenv, lib, cmake, xorg, plasma-framework, fetchFromGitHub, kdeWrapper }: { mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub }:
let version = "0.6.0"; let version = "0.6.0"; in
unwrapped = stdenv.mkDerivation { mkDerivation {
name = "latte-dock-${version}"; name = "latte-dock-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "psifidotos"; owner = "psifidotos";
repo = "Latte-Dock"; repo = "Latte-Dock";
rev = "v${version}"; rev = "v${version}";
sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv"; sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv";
}; };
buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ]; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
enableParallelBuilding = true; meta = with lib; {
description = "Dock-style app launcher based on Plasma frameworks";
meta = with stdenv.lib; { homepage = https://github.com/psifidotos/Latte-Dock;
description = "Dock-style app launcher based on Plasma frameworks"; license = licenses.gpl2;
homepage = https://github.com/psifidotos/Latte-Dock; platforms = platforms.unix;
license = licenses.gpl2; maintainers = [ maintainers.benley ];
platforms = platforms.unix; };
maintainers = [ maintainers.benley ];
};
};
in kdeWrapper {
inherit unwrapped;
targets = [ "bin/latte-dock" ];
} }

49
pkgs/applications/misc/yakuake/default.nix
View file

@ -2,7 +2,7 @@
, lib , lib
, fetchurl , fetchurl
, kdoctools , kdoctools
, kdeWrapper , wrapGAppsHook
, extra-cmake-modules , extra-cmake-modules
, karchive , karchive
, kcrash , kcrash
@ -18,11 +18,10 @@
}: }:
let let
unwrapped = let pname = "yakuake";
pname = "yakuake"; version = "3.0.3";
version = "3.0.3"; in mkDerivation rec {
in mkDerivation rec { name = "${pname}-${version}";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
@ -42,22 +41,28 @@ let
kwindowsystem kwindowsystem
]; ];
nativeBuildInputs = [ propagatedBuildInputs = [
extra-cmake-modules kdoctools karchive
]; kcrash
kdbusaddons
ki18n
kiconthemes
knewstuff
knotifications
knotifyconfig
kparts
kwindowsystem
];
meta = { propagatedUserEnvPkgs = [ konsole ];
homepage = https://yakuake.kde.org;
description = "Quad-style terminal emulator for KDE"; nativeBuildInputs = [
maintainers = with lib.maintainers; [ fridh ]; extra-cmake-modules kdoctools wrapGAppsHook
}; ];
meta = {
homepage = https://yakuake.kde.org;
description = "Quad-style terminal emulator for KDE";
maintainers = with lib.maintainers; [ fridh ];
}; };
in
kdeWrapper
{
inherit unwrapped;
targets = [ "bin/yakuake" ];
paths = [ konsole.unwrapped ];
} }

97
pkgs/applications/networking/irc/konversation/default.nix
View file

@ -2,14 +2,14 @@
, lib , lib
, fetchurl , fetchurl
, extra-cmake-modules , extra-cmake-modules
, kdoctools
, wrapGAppsHook
, kbookmarks , kbookmarks
, karchive , karchive
, kconfig , kconfig
, kconfigwidgets , kconfigwidgets
, kcoreaddons , kcoreaddons
, kdbusaddons , kdbusaddons
, kdeWrapper
, kdoctools
, kemoticons , kemoticons
, kglobalaccel , kglobalaccel
, ki18n , ki18n
@ -28,55 +28,50 @@
}: }:
let let
unwrapped = let pname = "konversation";
pname = "konversation"; version = "1.6.2";
version = "1.6.2"; in mkDerivation rec {
in mkDerivation rec { name = "${pname}-${version}";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn"; sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
};
buildInputs = [
kbookmarks
karchive
kconfig
kconfigwidgets
kcoreaddons
kdbusaddons
kdoctools
kemoticons
kglobalaccel
ki18n
kiconthemes
kidletime
kitemviews
knotifications
knotifyconfig
kio
kparts
kwallet
solid
sonnet
phonon
];
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
meta = {
description = "Integrated IRC client for KDE";
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh ];
homepage = https://konversation.kde.org;
};
}; };
in kdeWrapper {
inherit unwrapped;
targets = [ "bin/konversation" ];
}
buildInputs = [
kbookmarks
karchive
kconfig
kconfigwidgets
kcoreaddons
kdbusaddons
kdoctools
kemoticons
kglobalaccel
ki18n
kiconthemes
kidletime
kitemviews
knotifications
knotifyconfig
kio
kparts
kwallet
solid
sonnet
phonon
];
nativeBuildInputs = [
extra-cmake-modules
kdoctools
wrapGAppsHook
];
meta = {
description = "Integrated IRC client for KDE";
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh ];
homepage = https://konversation.kde.org;
};
}

68
pkgs/build-support/kde/wrapper.nix
View file

@ -1,68 +0,0 @@
{ stdenv, lib, makeWrapper, buildEnv, gtk3, dconf }:
packages:
let
packages_ = if builtins.isList packages then packages else [packages];
unwrapped = lib.concatMap (p: if builtins.isList p.unwrapped then p.unwrapped else [p.unwrapped]) packages_;
targets = lib.concatMap (p: p.targets) packages_;
paths = lib.concatMap (p: p.paths or []) packages_;
name =
if builtins.length unwrapped == 1
then (lib.head unwrapped).name
else "kde-application";
meta =
if builtins.length unwrapped == 1
then (lib.head unwrapped).meta
else {};
env = buildEnv {
inherit name meta;
paths = builtins.map lib.getBin (unwrapped ++ paths);
pathsToLink = [ "/bin" "/share" "/lib/qt5" "/etc/xdg" ];
};
in
stdenv.mkDerivation {
inherit name meta;
preferLocalBuild = true;
inherit unwrapped env targets;
passthru = {
inherit targets paths;
unwrapped = if builtins.length unwrapped == 1 then lib.head unwrapped else unwrapped;
};
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
for t in $targets; do
good=""
for drv in $unwrapped; do
if [ -a "$drv/$t" ]; then
makeWrapper "$drv/$t" "$out/$t" \
--argv0 '"$0"' \
--suffix PATH : "$env/bin" \
--prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
--prefix XDG_DATA_DIRS : "$env/share:${gtk3}/share/gsettings-schemas/${gtk3.name}" \
--prefix QML_IMPORT_PATH : "$env/lib/qt5/imports" \
--prefix QML2_IMPORT_PATH : "$env/lib/qt5/qml" \
--prefix QT_PLUGIN_PATH : "$env/lib/qt5/plugins" \
--prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules"
good="1"
break
fi
done
if [ -z "$good" ]; then
echo "file or directory not found in derivations: $t"
exit 1
fi
done
mkdir -p "$out/nix-support"
echo "$unwrapped" > "$out/nix-support/propagated-user-env-packages"
'';
}

22
pkgs/desktops/plasma-5/oxygen.nix
View file

@ -1,21 +1,15 @@
{ {
mkDerivation, kdeWrapper, mkDerivation,
extra-cmake-modules, extra-cmake-modules,
frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
}: }:
let mkDerivation {
unwrapped = mkDerivation { name = "oxygen";
name = "oxygen"; nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [
propagatedBuildInputs = [ frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras ];
];
};
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ];
} }

36
pkgs/tools/misc/kronometer/default.nix
View file

@ -1,29 +1,25 @@
{ {
mkDerivation, kdeWrapper, fetchurl, lib, mkDerivation, fetchurl, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kinit kconfig, kinit
}: }:
let let
pname = "kronometer"; pname = "kronometer";
version = "2.1.3"; version = "2.1.3";
unwrapped = mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i";
};
meta = with lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kconfig kinit ];
};
in in
kdeWrapper { mkDerivation rec {
inherit unwrapped; name = "${pname}-${version}";
targets = [ "bin/kronometer" ];
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i";
};
meta = with lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kinit ];
} }

39
pkgs/tools/misc/partition-manager/default.nix
View file

@ -1,31 +1,26 @@
{ mkDerivation, kdeWrapper, fetchurl, lib { mkDerivation, fetchurl, lib
, extra-cmake-modules, kdoctools , extra-cmake-modules, kdoctools, wrapGAppsHook
, kconfig, kinit, kpmcore , kconfig, kinit, kpmcore
, eject, libatasmart }: , eject, libatasmart }:
let let
pname = "partitionmanager"; pname = "partitionmanager";
unwrapped = mkDerivation rec { in mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "3.0.1"; version = "3.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410"; sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410";
};
meta = with lib; {
description = "KDE Partition Manager";
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
# refer to kpmcore for the use of eject
buildInputs = [ eject libatasmart ];
propagatedBuildInputs = [ kconfig kinit kpmcore ];
}; };
in kdeWrapper { meta = with lib; {
inherit unwrapped; description = "KDE Partition Manager";
targets = [ "bin/partitionmanager" ]; license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
# refer to kpmcore for the use of eject
buildInputs = [ eject libatasmart ];
propagatedBuildInputs = [ kconfig kinit kpmcore ];
} }

51
pkgs/tools/misc/peruse/default.nix
View file

@ -1,6 +1,6 @@
{ {
mkDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib, mkDerivation, fetchFromGitHub, fetchurl, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools, wrapGAppsHook,
baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
}: }:
@ -13,33 +13,28 @@ let
rev = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7"; rev = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr"; sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
}; };
unwrapped = mkDerivation rec { in mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${name}.tar.xz";
sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
pathsToLink = [ "/etc/xdg/peruse.knsrc"];
preConfigure = ''
rm -rf src/qtquick/karchive-rar/external/unarr
ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
'';
meta = with lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
src = fetchurl {
url = "mirror://kde/stable/${pname}/${name}.tar.xz";
sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
pathsToLink = [ "/etc/xdg/peruse.knsrc"];
preConfigure = ''
rm -rf src/qtquick/karchive-rar/external/unarr
ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
'';
meta = with lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
}; };
in kdeWrapper {
inherit unwrapped;
targets = [ "bin/peruse" "bin/perusecreator" ];
} }

78
pkgs/tools/security/kwalletcli/default.nix
View file

@ -1,5 +1,5 @@
{ {
kdeDerivation, kdeWrapper, fetchurl, lib, mkDerivation, fetchurl, lib,
pkgconfig, pkgconfig,
kcoreaddons, ki18n, kwallet, kcoreaddons, ki18n, kwallet,
mksh mksh
@ -8,48 +8,42 @@
let let
pname = "kwalletcli"; pname = "kwalletcli";
version = "3.00"; version = "3.00";
in
mkDerivation rec {
name = "${pname}-${version}";
unwrapped = kdeDerivation rec { src = fetchurl {
name = "${pname}-${version}"; url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz";
sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98";
src = fetchurl {
url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz";
sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98";
};
postPatch = ''
substituteInPlace GNUmakefile \
--replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \
--replace '-I/usr/include/KF5/KI18n' '-I${ki18n.dev}/include/KF5/KI18n' \
--replace '-I/usr/include/KF5/KWallet' '-I${kwallet.dev}/include/KF5/KWallet' \
--replace /usr/bin $out/bin \
--replace /usr/share/man $out/share/man
'';
makeFlags = [ "KDE_VER=5" ];
# we need this when building against qt 5.8+
NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
nativeBuildInputs = [ pkgconfig ];
# if using just kwallet, cmake will be added as a buildInput and fail the build
propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
preInstall = ''
mkdir -p $out/bin $out/share/man/man1
'';
meta = with lib; {
description = "Command-Line Interface to the KDE Wallet";
homepage = http://www.mirbsd.org/kwalletcli.htm;
license = licenses.miros;
maintainers = with maintainers; [ peterhoeg ];
};
}; };
in kdeWrapper { postPatch = ''
inherit unwrapped; substituteInPlace GNUmakefile \
targets = map (b: "bin/" + b) --replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \
[ "kwalletaskpass" "kwalletcli" "kwalletcli_getpin" "pinentry-kwallet" ]; --replace '-I/usr/include/KF5/KI18n' '-I${ki18n.dev}/include/KF5/KI18n' \
paths = [ mksh ]; --replace '-I/usr/include/KF5/KWallet' '-I${kwallet.dev}/include/KF5/KWallet' \
--replace /usr/bin $out/bin \
--replace /usr/share/man $out/share/man
'';
makeFlags = [ "KDE_VER=5" ];
# we need this when building against qt 5.8+
NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
nativeBuildInputs = [ pkgconfig ];
# if using just kwallet, cmake will be added as a buildInput and fail the build
propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
propagatedUserEnvPkgs = [ mksh ];
preInstall = ''
mkdir -p $out/bin $out/share/man/man1
'';
meta = with lib; {
description = "Command-Line Interface to the KDE Wallet";
homepage = http://www.mirbsd.org/kwalletcli.htm;
license = licenses.miros;
maintainers = with maintainers; [ peterhoeg ];
};
} }

79
pkgs/tools/text/kdiff3/default.nix
View file

@ -1,49 +1,44 @@
{ {
mkDerivation, lib, kdeWrapper, fetchgit, fetchpatch, mkDerivation, lib, fetchgit, fetchpatch,
extra-cmake-modules, kdoctools, kconfig, kinit, kparts extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kinit, kparts
}: }:
let mkDerivation rec {
unwrapped = mkDerivation rec { name = "kdiff3-${version}";
name = "kdiff3-${version}"; version = "1.7.0-2017-02-19";
version = "1.7.0-2017-02-19";
src = fetchgit { src = fetchgit {
# gitlab is outdated # gitlab is outdated
url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git; url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git;
sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8"; sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8";
rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f"; rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f";
};
setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
patches = [
(fetchpatch {
name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
})
];
patchFlags = "-p 2";
postPatch = ''
sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
'';
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kconfig kinit kparts ];
meta = with lib; {
homepage = http://kdiff3.sourceforge.net/;
license = licenses.gpl2Plus;
description = "Compares and merges 2 or 3 files or directories";
maintainers = with maintainers; [ viric peterhoeg ];
platforms = with platforms; linux;
};
}; };
in kdeWrapper { setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
inherit unwrapped;
targets = [ "bin/kdiff3" ]; patches = [
(fetchpatch {
name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
})
];
patchFlags = "-p 2";
postPatch = ''
sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
'';
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kinit kparts ];
meta = with lib; {
homepage = http://kdiff3.sourceforge.net/;
license = licenses.gpl2Plus;
description = "Compares and merges 2 or 3 files or directories";
maintainers = with maintainers; [ viric peterhoeg ];
platforms = with platforms; linux;
};
} }

4
pkgs/top-level/all-packages.nix
View file

@ -292,10 +292,6 @@ with pkgs;
inherit kernel rootModules allowMissing; inherit kernel rootModules allowMissing;
}; };
kdeWrapper = callPackage ../build-support/kde/wrapper.nix {
inherit (gnome3) dconf;
};
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; }; nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;