diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-02 10:49:52 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:42:20 -0500 |
commit | 6beea32ab104af7aad43383513682198d2f01430 (patch) | |
tree | 2dae9e93dd9cbc26415cb6ecebc187c23fff3558 | |
parent | 7b6f8dc77f7ba2cc28bdff390f5922befefa8b48 (diff) | |
download | nixpkgs-6beea32ab104af7aad43383513682198d2f01430.tar nixpkgs-6beea32ab104af7aad43383513682198d2f01430.tar.gz nixpkgs-6beea32ab104af7aad43383513682198d2f01430.tar.bz2 nixpkgs-6beea32ab104af7aad43383513682198d2f01430.tar.lz nixpkgs-6beea32ab104af7aad43383513682198d2f01430.tar.xz nixpkgs-6beea32ab104af7aad43383513682198d2f01430.tar.zst nixpkgs-6beea32ab104af7aad43383513682198d2f01430.zip |
kdeApplications: rename kdeApp to mkDerivation
47 files changed, 96 insertions, 97 deletions
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index fa8d4d8313e..3834269f180 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,4 +1,4 @@ -{ kdeDerivation +{ mkDerivation , lib , fetchgit , extra-cmake-modules @@ -23,7 +23,7 @@ let unwrapped = - kdeDerivation rec { + mkDerivation rec { name = "kile-${version}"; version = "2017-02-09"; diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 830c9e6899e..7d017f6496f 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -1,11 +1,11 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine, akonadi }: -kdeApp { +mkDerivation { name = "akonadi-contacts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index ba4b4b50242..390ef373528 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, akonadi, kdbusaddons, kio, kitemmodels, kmime }: -kdeApp { +mkDerivation { name = "akonadi-mime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/applications/kde/akonadi.nix b/pkgs/applications/kde/akonadi.nix index 284ed60a9cb..367fdd36fb8 100644 --- a/pkgs/applications/kde/akonadi.nix +++ b/pkgs/applications/kde/akonadi.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, kio, boost, kitemmodels }: -kdeApp { +mkDerivation { name = "akonadi"; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 52cb403f202..d7a6ee2bdc7 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, config, kdeWrapper, + mkDerivation, lib, config, kdeWrapper, extra-cmake-modules, kdoctools, makeWrapper, @@ -15,7 +15,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "ark"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix index bb680305709..17ae75cc479 100644 --- a/pkgs/applications/kde/baloo-widgets.nix +++ b/pkgs/applications/kde/baloo-widgets.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kdoctools, baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice }: -kdeApp { +mkDerivation { name = "baloo-widgets"; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5056cc8725e..931132cf428 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -40,7 +40,7 @@ let packages = self: with self; let callPackage = self.newScope { - kdeApp = import ./build-support/application.nix { + mkDerivation = import ./build-support/application.nix { inherit lib; inherit srcs; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix index 7f436c7a55a..670b040f79f 100644 --- a/pkgs/applications/kde/dolphin-plugins.nix +++ b/pkgs/applications/kde/dolphin-plugins.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kdoctools, dolphin, kdelibs4support, ki18n, kio, kxmlgui }: -kdeApp { +mkDerivation { name = "dolphin-plugins"; meta = { license = [ lib.licenses.gpl2 ]; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 6515c230c28..746afa2732d 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, makeQtWrapper, baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils, kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, @@ -9,7 +9,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "dolphin"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index 5dde6d8a64e..4e915422d14 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, ffmpeg, kio }: -kdeApp { +mkDerivation { name = "ffmpegthumbs"; meta = { license = with lib.licenses; [ gpl2 bsd3 ]; diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index 71ab51320ab..c09b5f5106a 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kio, kparts, kxmlgui, qtscript, solid }: let unwrapped = - kdeApp { + mkDerivation { name = "filelight"; meta = { license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 0fa06ed0fbe..19b2fd751f7 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2, libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras @@ -7,7 +7,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "gwenview"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index d1cd33a5208..c21ce4a3e18 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,4 +1,4 @@ -{ kdeApp, lib, kdeWrapper, extra-cmake-modules +{ mkDerivation, lib, kdeWrapper, extra-cmake-modules , qtwebkit , libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis @@ -9,7 +9,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "k3b"; meta = with lib; { license = with licenses; [ gpl2Plus ]; diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index cd320afd8d3..7a138afb8ed 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole, @@ -9,7 +9,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "kate"; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix index d43de1fdc36..fd5c4502c9d 100644 --- a/pkgs/applications/kde/kcachegrind.nix +++ b/pkgs/applications/kde/kcachegrind.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kio, ki18n, perl, python, php }: kdeWrapper { - unwrapped = kdeApp { + unwrapped = mkDerivation { name = "kcachegrind"; meta = { license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 8ec7591460e..6ce0722d3e4 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp }: let unwrapped = - kdeApp { + mkDerivation { name = "kcalc"; meta = { license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix index c1266009b68..f910b99f603 100644 --- a/pkgs/applications/kde/kcolorchooser.nix +++ b/pkgs/applications/kde/kcolorchooser.nix @@ -1,11 +1,11 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui }: let unwrapped = - kdeApp { + mkDerivation { name = "kcolorchooser"; meta = { license = with lib.licenses; [ mit ]; diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix index 5143df60ef4..d49ba125474 100644 --- a/pkgs/applications/kde/kcontacts.nix +++ b/pkgs/applications/kde/kcontacts.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, ki18n, kcoreaddons, kconfig, kcodecs }: -kdeApp { +mkDerivation { name = "kcontacts"; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix index e83794c60d8..daf0a55b19e 100644 --- a/pkgs/applications/kde/kde-locale-4.nix +++ b/pkgs/applications/kde/kde-locale-4.nix @@ -1,8 +1,8 @@ name: args: -{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }: +{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }: -kdeApp (args // { +mkDerivation (args // { sname = "kde-l10n-${name}"; name = "kde-l10n-${name}-qt4"; diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix index 772ebe37e44..76d601cbdc0 100644 --- a/pkgs/applications/kde/kde-locale-5.nix +++ b/pkgs/applications/kde/kde-locale-5.nix @@ -1,8 +1,8 @@ name: args: -{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }: +{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }: -kdeApp (args // { +mkDerivation (args // { sname = "kde-l10n-${name}"; name = "kde-l10n-${name}-qt5"; diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix index e50c92f8884..09f761df851 100644 --- a/pkgs/applications/kde/kdegraphics-mobipocket.nix +++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kio }: -kdeApp { +mkDerivation { name = "kdegraphics-mobipocket"; meta = { license = [ lib.licenses.gpl2Plus ]; diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 5aa974a9c96..3302681bd85 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,9 +1,9 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kio, libkexiv2, libkdcraw }: -kdeApp { +mkDerivation { name = "kdegraphics-thumbnailers"; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix index cae1b9b7e7f..e3abe89eade 100644 --- a/pkgs/applications/kde/kdelibs/default.nix +++ b/pkgs/applications/kde/kdelibs/default.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, + mkDerivation, lib, automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info, attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase, libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4, shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch }: -kdeApp { +mkDerivation { name = "kdelibs"; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index 20f81563c3b..62176f3f3bb 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcoreaddons, ki18n, kio, kwidgetsaddons, samba }: -kdeApp { +mkDerivation { name = "kdenetwork-filesharing"; meta = { license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index e543a3d84bf..4e59e12e8fd 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -1,4 +1,4 @@ -{ kdeApp +{ mkDerivation , kdeWrapper , lib , extra-cmake-modules @@ -32,7 +32,7 @@ }: let -unwrapped = kdeApp { +unwrapped = mkDerivation { name = "kdenlive"; patches = [ ./kdenlive-cmake-concurrent-module.patch diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix index 97e74eb2e12..aaeac0161f5 100644 --- a/pkgs/applications/kde/kdf.nix +++ b/pkgs/applications/kde/kdf.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kcmutils }: let unwrapped = - kdeApp { + mkDerivation { name = "kdf"; meta = { license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index 58e9cb0d1e9..5b462c2712f 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, makeQtWrapper, + mkDerivation, lib, makeQtWrapper, extra-cmake-modules, kdoctools, ki18n, akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem }: -kdeApp { +mkDerivation { name = "kgpg"; nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ]; buildInputs = [ diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index 0579faa72a0..e88bef4c652 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -1,5 +1,5 @@ { - kdeApp, kdeWrapper, + mkDerivation, kdeWrapper, extra-cmake-modules, kdoctools, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support, khtml, kservice, xapian @@ -7,7 +7,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "khelpcenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix index 9f38079316f..03229f9a150 100644 --- a/pkgs/applications/kde/kig.nix +++ b/pkgs/applications/kde/kig.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, kdeWrapper - , extra-cmake-modules, kdoctools, kparts - , qtsvg, qtxmlpatterns, ktexteditor, boost + mkDerivation, lib, kdeWrapper, + extra-cmake-modules, kdoctools, + kparts, qtsvg, qtxmlpatterns, ktexteditor, boost }: let unwrapped = - kdeApp { + mkDerivation { name = "kig"; meta = { license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 77f795167fc..50709a7ddef 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, extra-cmake-modules, kdoctools, shared_mime_info, + mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, qtsvg, samba, solid }: -kdeApp { +mkDerivation { name = "kio-extras"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index c17b3fdcd8e..5bd8762391c 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, ki18n, kcodecs }: -kdeApp { +mkDerivation { name = "kmime"; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index 6ab653cfce0..483983571dd 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support, plasma-framework, libpulseaudio, alsaLib, libcanberra_kde @@ -7,7 +7,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "kmix"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix index 75d5b6fca65..bdfeb233af3 100644 --- a/pkgs/applications/kde/kolourpaint.nix +++ b/pkgs/applications/kde/kolourpaint.nix @@ -1,5 +1,5 @@ { lib -, kdeApp +, mkDerivation , kdeWrapper , extra-cmake-modules , kdoctools @@ -9,7 +9,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "kolourpaint"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ @@ -25,4 +25,4 @@ let in kdeWrapper { inherit unwrapped; targets = ["bin/kolourpaint"]; -} \ No newline at end of file +} diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index 660090dc84a..c14f15707aa 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kparts, ktexteditor, kwidgetsaddons, libkomparediff2 }: let unwrapped = - kdeApp { + mkDerivation { name = "kompare"; meta = { license = with lib.licenses; [ gpl2 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 15b6373bdb0..4eb45c74480 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, @@ -9,7 +9,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "konsole"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index ef5530be6fa..3ad7b436dbc 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kdelibs4support, kdnssd, libvncserver, libXtst }: let unwrapped = - kdeApp { + mkDerivation { name = "krfb"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix index afa870d90a5..efdcac650bb 100644 --- a/pkgs/applications/kde/kwalletmanager.nix +++ b/pkgs/applications/kde/kwalletmanager.nix @@ -1,5 +1,5 @@ { lib -, kdeApp +, mkDerivation , kdeWrapper , extra-cmake-modules , kdoctools @@ -13,7 +13,7 @@ }: let - unwrapped = kdeApp { + unwrapped = mkDerivation { name = "kwalletmanager"; meta = { license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix index 3d05714e824..edd9732d051 100644 --- a/pkgs/applications/kde/libkcddb.nix +++ b/pkgs/applications/kde/libkcddb.nix @@ -1,8 +1,8 @@ -{ kdeApp, lib, extra-cmake-modules, qtbase, kdoctools +{ mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools , kcodecs, ki18n, kio, kwidgetsaddons , libmusicbrainz5 }: -kdeApp { +mkDerivation { name = "libkcddb"; meta = with lib; { license = with licenses; [ gpl2 lgpl21 bsd3 ]; @@ -14,5 +14,4 @@ kdeApp { kcodecs ki18n kio kwidgetsaddons libmusicbrainz5 ]; - enableParallelBuilding = true; } diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix index 179e9f414dc..383bd3b6703 100644 --- a/pkgs/applications/kde/libkdcraw.nix +++ b/pkgs/applications/kde/libkdcraw.nix @@ -1,6 +1,6 @@ -{ kdeApp, lib, extra-cmake-modules, libraw, qtbase }: +{ mkDerivation, lib, extra-cmake-modules, libraw, qtbase }: -kdeApp { +mkDerivation { name = "libkdcraw"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix index 0991c5df5ab..816d4168967 100644 --- a/pkgs/applications/kde/libkexiv2.nix +++ b/pkgs/applications/kde/libkexiv2.nix @@ -1,6 +1,6 @@ -{ kdeApp, lib, exiv2, extra-cmake-modules, qtbase }: +{ mkDerivation, lib, exiv2, extra-cmake-modules, qtbase }: -kdeApp { +mkDerivation { name = "libkexiv2"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix index 32eeb171ff8..3a28d8c2e8c 100644 --- a/pkgs/applications/kde/libkipi.nix +++ b/pkgs/applications/kde/libkipi.nix @@ -1,6 +1,6 @@ -{ kdeApp, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }: +{ mkDerivation, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }: -kdeApp { +mkDerivation { name = "libkipi"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix index aacc89a0efe..52aa2b10e24 100644 --- a/pkgs/applications/kde/libkomparediff2.nix +++ b/pkgs/applications/kde/libkomparediff2.nix @@ -1,6 +1,6 @@ -{ kdeApp, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: +{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: -kdeApp { +mkDerivation { name = "libkomparediff2"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ]; diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 5322c66b01d..eb059a1b398 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -1,4 +1,4 @@ -{ kdeApp, lib, kdeWrapper +{ mkDerivation, lib, kdeWrapper , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebkit , krunner, shared_mime_info, kparts, knewstuff @@ -7,7 +7,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "marble"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 59520e28532..7fb4ffb7693 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5 @@ -7,7 +7,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "okteta"; meta = { license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index f5b3e38ca7c..3bed7454f42 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, @@ -8,7 +8,7 @@ }: let - unwrapped = kdeApp { + unwrapped = mkDerivation { name = "okular"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index 0a3d311eb27..a2589f46bba 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -1,11 +1,11 @@ { - kdeApp, lib, extra-cmake-modules, + mkDerivation, lib, extra-cmake-modules, cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio, knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework, qtdeclarative }: -kdeApp { +mkDerivation { name = "print-manager"; meta = { license = [ lib.licenses.gpl2 ]; diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 30abfc23e83..a0c5ef58c9b 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, kdeWrapper, extra-cmake-modules, kdoctools, kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, @@ -8,7 +8,7 @@ let unwrapped = - kdeApp { + mkDerivation { name = "spectacle"; meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; |