ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 22:32:58 +03:00
Code Issues Projects Releases Wiki Activity

plasma5: rename plasmaPackage to mkDerivation

Browse Source
This commit is contained in:
Thomas Tuegel 2017-05-15 11:44:58 -05:00
parent 6beea32ab1
commit eaa644a5af
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
38 changed files with 106 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/plasma-5/bluedevil.nix
View File

@ -1,10 +1,10 @@
{ {
plasmaPackage, extra-cmake-modules, shared_mime_info, mkDerivation, extra-cmake-modules, shared_mime_info,
bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
}: }:
plasmaPackage { mkDerivation {
name = "bluedevil"; name = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/breeze-grub.nix
View File

@ -1,8 +1,8 @@
{ {
plasmaPackage mkDerivation
}: }:
plasmaPackage { mkDerivation {
name = "breeze-grub"; name = "breeze-grub";
outputs = [ "out" ]; outputs = [ "out" ];
installPhase = '' installPhase = ''

7
pkgs/desktops/plasma-5/breeze-gtk.nix
View File

@ -1,9 +1,6 @@
{ plasmaPackage { mkDerivation , extra-cmake-modules , qtbase }:
, extra-cmake-modules
, qtbase
}:
plasmaPackage { mkDerivation {
name = "breeze-gtk"; name = "breeze-gtk";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ]; cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ];

4
pkgs/desktops/plasma-5/breeze-plymouth/default.nix
View File

@ -1,10 +1,10 @@
{ {
plasmaPackage, lib, copyPathsToStore, mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, extra-cmake-modules,
plymouth plymouth
}: }:
plasmaPackage { mkDerivation {
name = "breeze-plymouth"; name = "breeze-plymouth";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ plymouth ]; buildInputs = [ plymouth ];

4
pkgs/desktops/plasma-5/breeze-qt4.nix
View File

@ -1,10 +1,10 @@
{ {
plasmaPackage, lib, mkDerivation, lib,
automoc4, cmake, perl, pkgconfig, automoc4, cmake, perl, pkgconfig,
kdelibs4, qt4, xproto kdelibs4, qt4, xproto
}: }:
plasmaPackage { mkDerivation {
name = "breeze-qt4"; name = "breeze-qt4";
sname = "breeze"; sname = "breeze";
buildInputs = [ kdelibs4 qt4 xproto ]; buildInputs = [ kdelibs4 qt4 xproto ];

4
pkgs/desktops/plasma-5/breeze-qt5.nix
View File

@ -1,11 +1,11 @@
{ {
plasmaPackage, mkDerivation,
extra-cmake-modules, extra-cmake-modules,
frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
}: }:
plasmaPackage { mkDerivation {
name = "breeze-qt5"; name = "breeze-qt5";
sname = "breeze"; sname = "breeze";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];

27
pkgs/desktops/plasma-5/build-support/package.nix
View File

@ -1,27 +0,0 @@
{ mkDerivation, lib, fetchurl }:
let
mirror = "mirror://kde";
srcs = import ../srcs.nix { inherit fetchurl mirror; };
in
args:
let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in
mkDerivation (args // {
name = "${name}-${version}";
inherit src;
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
} // (args.meta or {});
})

31
pkgs/desktops/plasma-5/default.nix
View File

@ -31,13 +31,36 @@ existing packages here and modify it as necessary.
}: }:
let let
srcs = import ./srcs.nix {
inherit fetchurl;
mirror = "mirror://kde";
};
packages = self: with self; packages = self: with self;
let let
callPackage = self.newScope { callPackage = self.newScope {
plasmaPackage = import ./build-support/package.nix { mkDerivation = args:
inherit lib fetchurl; let
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; inherit (args) name;
}; sname = args.sname or name;
inherit (srcs."${sname}") src version;
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in
mkDerivation (args // {
name = "${name}-${version}";
inherit src;
outputs = args.outputs or [ "out" "dev" ];
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
} // (args.meta or {});
});
}; };
in { in {
bluedevil = callPackage ./bluedevil.nix {}; bluedevil = callPackage ./bluedevil.nix {};

4
pkgs/desktops/plasma-5/kactivitymanagerd.nix
View File

@ -1,10 +1,10 @@
{ plasmaPackage { mkDerivation
, extra-cmake-modules , extra-cmake-modules
, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel , boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel
, kwindowsystem, kxmlgui , kwindowsystem, kxmlgui
}: }:
plasmaPackage { mkDerivation {
name = "kactivitymanagerd"; name = "kactivitymanagerd";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/kde-cli-tools.nix
View File

@ -1,10 +1,10 @@
{ {
plasmaPackage, extra-cmake-modules, mkDerivation, extra-cmake-modules,
kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes, kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
kwindowsystem, qtsvg, qtx11extras kwindowsystem, qtsvg, qtx11extras
}: }:
plasmaPackage { mkDerivation {
name = "kde-cli-tools"; name = "kde-cli-tools";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/kde-gtk-config/default.nix
View File

@ -1,4 +1,4 @@
{ plasmaPackage { mkDerivation
, extra-cmake-modules , extra-cmake-modules
, glib , glib
, gtk2 , gtk2
@ -12,7 +12,7 @@
, knewstuff , knewstuff
}: }:
plasmaPackage { mkDerivation {
name = "kde-gtk-config"; name = "kde-gtk-config";
patches = [ ./0001-follow-symlinks.patch ]; patches = [ ./0001-follow-symlinks.patch ];
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];

4
pkgs/desktops/plasma-5/kdecoration.nix
View File

@ -1,6 +1,6 @@
{ plasmaPackage, extra-cmake-modules, qtbase }: { mkDerivation, extra-cmake-modules, qtbase }:
plasmaPackage { mkDerivation {
name = "kdecoration"; name = "kdecoration";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];

9
pkgs/desktops/plasma-5/kdeplasma-addons.nix
View File

@ -1,16 +1,13 @@
{ plasmaPackage, extra-cmake-modules, kdoctools { mkDerivation, extra-cmake-modules, kdoctools
, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n , kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion , kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
, ibus , ibus
}: }:
plasmaPackage { mkDerivation {
name = "kdeplasma-addons"; name = "kdeplasma-addons";
nativeBuildInputs = [ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
extra-cmake-modules
kdoctools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
kross krunner kservice ksysguard kunitconversion plasma-framework kross krunner kservice ksysguard kunitconversion plasma-framework

4
pkgs/desktops/plasma-5/kgamma5.nix
View File

@ -1,8 +1,8 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support { mkDerivation, extra-cmake-modules, kdoctools, kdelibs4support
, qtx11extras , qtx11extras
}: }:
plasmaPackage { mkDerivation {
name = "kgamma5"; name = "kgamma5";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kdelibs4support qtx11extras ]; propagatedBuildInputs = [ kdelibs4support qtx11extras ];

4
pkgs/desktops/plasma-5/khotkeys.nix
View File

@ -1,10 +1,10 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils { mkDerivation, extra-cmake-modules, kdoctools, kcmutils
, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
, plasma-framework, plasma-workspace, qtx11extras , plasma-framework, plasma-workspace, qtx11extras
, fetchpatch , fetchpatch
}: }:
plasmaPackage { mkDerivation {
name = "khotkeys"; name = "khotkeys";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/kinfocenter.nix
View File

@ -1,12 +1,12 @@
{ {
plasmaPackage, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice,
kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid
}: }:
plasmaPackage { mkDerivation {
name = "kinfocenter"; name = "kinfocenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/kmenuedit.nix
View File

@ -1,11 +1,11 @@
{ {
plasmaPackage, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui, kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui,
sonnet sonnet
}: }:
plasmaPackage { mkDerivation {
name = "kmenuedit"; name = "kmenuedit";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/kscreen.nix
View File

@ -1,9 +1,9 @@
{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets { mkDerivation, extra-cmake-modules, kconfig, kconfigwidgets
, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
, libkscreen, qtdeclarative, qtgraphicaleffects , libkscreen, qtdeclarative, qtgraphicaleffects
}: }:
plasmaPackage { mkDerivation {
name = "kscreen"; name = "kscreen";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/kscreenlocker.nix
View File

@ -1,11 +1,11 @@
{ {
plasmaPackage, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime, kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
}: }:
plasmaPackage { mkDerivation {
name = "kscreenlocker"; name = "kscreenlocker";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/ksshaskpass.nix
View File

@ -1,8 +1,8 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons { mkDerivation, extra-cmake-modules, kdoctools, kcoreaddons
, ki18n, kwallet, kwidgetsaddons , ki18n, kwallet, kwidgetsaddons
}: }:
plasmaPackage { mkDerivation {
name = "ksshaskpass"; name = "ksshaskpass";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ]; propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];

4
pkgs/desktops/plasma-5/ksysguard.nix
View File

@ -1,12 +1,12 @@
{ {
plasmaPackage, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
lm_sensors, lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
knewstuff, libksysguard, qtwebkit knewstuff, libksysguard, qtwebkit
}: }:
plasmaPackage { mkDerivation {
name = "ksysguard"; name = "ksysguard";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ lm_sensors ]; buildInputs = [ lm_sensors ];

5
pkgs/desktops/plasma-5/kwallet-pam.nix
View File

@ -1,7 +1,6 @@
{ plasmaPackage, extra-cmake-modules, pam, socat, libgcrypt { mkDerivation, extra-cmake-modules, pam, socat, libgcrypt }:
}:
plasmaPackage { mkDerivation {
name = "kwallet-pam"; name = "kwallet-pam";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];

17
pkgs/desktops/plasma-5/kwayland-integration.nix
View File

@ -1,16 +1,7 @@
{ plasmaPackage { mkDerivation , extra-cmake-modules , kidletime , kwayland , kwindowsystem }:
, extra-cmake-modules
, kidletime
, kwayland
, kwindowsystem
}:
plasmaPackage { mkDerivation {
name = "kwayland-integration"; name = "kwayland-integration";
nativeBuildInputs = [ nativeBuildInputs = [ extra-cmake-modules ];
extra-cmake-modules propagatedBuildInputs = [ kidletime kwindowsystem kwayland ];
];
propagatedBuildInputs = [
kidletime kwindowsystem kwayland
];
} }

4
pkgs/desktops/plasma-5/kwin/default.nix
View File

@ -1,5 +1,5 @@
{ {
plasmaPackage, lib, copyPathsToStore, mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig, breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig,
kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel,
@ -10,7 +10,7 @@
xcb-util-cursor, xwayland xcb-util-cursor, xwayland
}: }:
plasmaPackage { mkDerivation {
name = "kwin"; name = "kwin";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

4
pkgs/desktops/plasma-5/kwrited.nix
View File

@ -1,8 +1,8 @@
{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty { mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty
, knotifications, kdbusaddons , knotifications, kdbusaddons
}: }:
plasmaPackage { mkDerivation {
name = "kwrited"; name = "kwrited";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ]; propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];

12
pkgs/desktops/plasma-5/libkscreen/default.nix
View File

@ -1,17 +1,13 @@
{ plasmaPackage, lib, copyPathsToStore { mkDerivation, lib, copyPathsToStore
, extra-cmake-modules , extra-cmake-modules
, kwayland, libXrandr , kwayland, libXrandr
, qtx11extras , qtx11extras
}: }:
plasmaPackage { mkDerivation {
name = "libkscreen"; name = "libkscreen";
nativeBuildInputs = [ nativeBuildInputs = [ extra-cmake-modules ];
extra-cmake-modules propagatedBuildInputs = [ kwayland libXrandr qtx11extras ];
];
propagatedBuildInputs = [
kwayland libXrandr qtx11extras
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
preConfigure = '' preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/$qtPluginPrefix/kf5/kscreen\"" NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/$qtPluginPrefix/kf5/kscreen\""

4
pkgs/desktops/plasma-5/libksysguard/default.nix
View File

@ -1,12 +1,12 @@
{ {
plasmaPackage, mkDerivation,
extra-cmake-modules, extra-cmake-modules,
kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
qtx11extras qtx11extras
}: }:
plasmaPackage { mkDerivation {
name = "libksysguard"; name = "libksysguard";
patches = [ patches = [
./0001-qdiriterator-follow-symlinks.patch ./0001-qdiriterator-follow-symlinks.patch

4
pkgs/desktops/plasma-5/milou.nix
View File

@ -1,9 +1,9 @@
{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative { mkDerivation, extra-cmake-modules, qtscript, qtdeclarative
, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework , kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
, krunner , krunner
}: }:
plasmaPackage { mkDerivation {
name = "milou"; name = "milou";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

4
pkgs/desktops/plasma-5/oxygen.nix
View File

@ -1,12 +1,12 @@
{ {
plasmaPackage, kdeWrapper, mkDerivation, kdeWrapper,
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 let
unwrapped = plasmaPackage { unwrapped = mkDerivation {
name = "oxygen"; name = "oxygen";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/plasma-desktop/default.nix
View File

@ -1,5 +1,5 @@
{ {
plasmaPackage, lib, copyPathsToStore, mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth, attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
@ -12,7 +12,7 @@
utillinux utillinux
}: }:
plasmaPackage rec { mkDerivation rec {
name = "plasma-desktop"; name = "plasma-desktop";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [

4
pkgs/desktops/plasma-5/plasma-integration.nix
View File

@ -1,11 +1,11 @@
{ plasmaPackage, extra-cmake-modules { mkDerivation, extra-cmake-modules
, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland , breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
, libXcursor , libXcursor
}: }:
# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
plasmaPackage { mkDerivation {
name = "plasma-integration"; name = "plasma-integration";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

5
pkgs/desktops/plasma-5/plasma-nm/default.nix
View File

@ -1,4 +1,4 @@
{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools { mkDerivation, substituteAll, extra-cmake-modules, kdoctools
, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
@ -7,7 +7,7 @@
, qca-qt5, qtdeclarative, solid, openvpn , qca-qt5, qtdeclarative, solid, openvpn
}: }:
plasmaPackage { mkDerivation {
name = "plasma-nm"; name = "plasma-nm";
patches = [ patches = [
(substituteAll { (substituteAll {
@ -27,5 +27,4 @@ plasmaPackage {
mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
qca-qt5 solid qca-qt5 solid
]; ];
enableParallelBuilding = true;
} }

8
pkgs/desktops/plasma-5/plasma-pa.nix
View File

@ -1,15 +1,13 @@
{ {
plasmaPackage, mkDerivation,
extra-cmake-modules, extra-cmake-modules,
gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
}: }:
plasmaPackage { mkDerivation {
name = "plasma-pa"; name = "plasma-pa";
nativeBuildInputs = [ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
extra-cmake-modules kdoctools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
gconf glib kconfigwidgets kcoreaddons kdeclarative gconf glib kconfigwidgets kcoreaddons kdeclarative
kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework

4
pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
View File

@ -1,8 +1,8 @@
{ plasmaPackage { mkDerivation
, extra-cmake-modules , extra-cmake-modules
}: }:
plasmaPackage { mkDerivation {
name = "plasma-workspace-wallpapers"; name = "plasma-workspace-wallpapers";
outputs = [ "out" ]; outputs = [ "out" ];
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/plasma-5/plasma-workspace/default.nix
View File

@ -1,5 +1,5 @@
{ {
plasmaPackage, lib, copyPathsToStore, mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
@ -12,7 +12,7 @@
libXcursor, pam, wayland libXcursor, pam, wayland
}: }:
plasmaPackage { mkDerivation {
name = "plasma-workspace"; name = "plasma-workspace";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];

4
pkgs/desktops/plasma-5/polkit-kde-agent.nix
View File

@ -1,10 +1,10 @@
{ {
plasmaPackage, extra-cmake-modules, mkDerivation, extra-cmake-modules,
kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
kwidgetsaddons, kwindowsystem, polkit-qt kwidgetsaddons, kwindowsystem, polkit-qt
}: }:
plasmaPackage { mkDerivation {
name = "polkit-kde-agent"; name = "polkit-kde-agent";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/plasma-5/powerdevil.nix
View File

@ -1,10 +1,10 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities { mkDerivation, extra-cmake-modules, kdoctools, bluez-qt, kactivities
, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n , kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
, kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt , kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
, plasma-workspace, qtx11extras, solid, udev , plasma-workspace, qtx11extras, solid, udev
}: }:
plasmaPackage { mkDerivation {
name = "powerdevil"; name = "powerdevil";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/desktops/plasma-5/systemsettings.nix
View File

@ -1,12 +1,12 @@
{ {
plasmaPackage, extra-cmake-modules, kdoctools, makeQtWrapper, mkDerivation, extra-cmake-modules, kdoctools, makeQtWrapper,
kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2 kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2
}: }:
plasmaPackage { mkDerivation {
name = "systemsettings"; name = "systemsettings";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2