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

plasma5: fixup inputs and outputs

This commit is contained in:
Thomas Tuegel 2017-05-26 15:44:36 -05:00
parent 7f95d4834f
commit 8538d75734
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
24 changed files with 162 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,6 @@
mkDerivation { mkDerivation {
name = "breeze-grub"; name = "breeze-grub";
outputs = [ "out" ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

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

@ -5,10 +5,10 @@ let inherit (lib) getLib; in
mkDerivation { mkDerivation {
name = "breeze-gtk"; name = "breeze-gtk";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
postPatch = '' postPatch = ''
sed -i cmake/FindGTKEngine.cmake \ sed -i cmake/FindGTKEngine.cmake \
-e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|" -e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|"
''; '';
cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
} }

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

@ -8,7 +8,6 @@ mkDerivation {
name = "breeze-plymouth"; name = "breeze-plymouth";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ plymouth ]; buildInputs = [ plymouth ];
outputs = [ "out" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
postPatch = '' postPatch = ''
substituteInPlace cmake/FindPlymouth.cmake --subst-var out substituteInPlace cmake/FindPlymouth.cmake --subst-var out

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

@ -9,6 +9,7 @@ mkDerivation {
sname = "breeze"; sname = "breeze";
buildInputs = [ kdelibs4 qt4 xproto ]; buildInputs = [ kdelibs4 qt4 xproto ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
outputs = [ "out" "dev" ];
cmakeFlags = [ cmakeFlags = [
"-DUSE_KDE4=ON" "-DUSE_KDE4=ON"
"-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"

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

@ -15,5 +15,6 @@ mkDerivation {
kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
qtx11extras qtx11extras
]; ];
outputs = [ "out" "dev" "bin" ];
cmakeFlags = [ "-DUSE_Qt4=OFF" ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ];
} }

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

@ -36,21 +36,44 @@ let
mirror = "mirror://kde"; mirror = "mirror://kde";
}; };
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
packages = self: with self; packages = self: with self;
let let
propagate = out:
let setupHook = { writeScript }:
writeScript "setup-hook.sh" ''
# Propagate $${out} output
propagatedUserEnvPkgs+=" @${out}@"
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "$outputDev" != out ]; then
if [ -n "$crossConfig" ]; then
propagatedBuildInputs+=" @dev@"
else
propagatedNativeBuildInputs+=" @dev@"
fi
fi
'';
in callPackage setupHook {};
propagateBin = propagate "bin";
callPackage = self.newScope { callPackage = self.newScope {
mkDerivation = args: mkDerivation = args:
let let
inherit (args) name; inherit (args) name;
sname = args.sname or name; sname = args.sname or name;
inherit (srcs."${sname}") src version; inherit (srcs."${sname}") src version;
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in
mkDerivation (args // {
name = "${name}-${version}";
inherit src;
outputs = args.outputs or [ "out" "dev" ]; outputs = args.outputs or [ "out" ];
hasBin = lib.elem "bin" outputs;
hasDev = lib.elem "dev" outputs;
defaultSetupHook = if hasBin && hasDev then propagateBin else null;
setupHook = args.setupHook or defaultSetupHook;
meta = { meta = {
license = with lib.licenses; [ license = with lib.licenses; [
@ -60,8 +83,13 @@ let
maintainers = with lib.maintainers; [ ttuegel ]; maintainers = with lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org"; homepage = "http://www.kde.org";
} // (args.meta or {}); } // (args.meta or {});
in
mkDerivation (args // {
name = "${name}-${version}";
inherit meta outputs setupHook src;
}); });
}; };
in { in {
bluedevil = callPackage ./bluedevil.nix {}; bluedevil = callPackage ./bluedevil.nix {};
breeze-gtk = callPackage ./breeze-gtk.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {};

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

@ -1,7 +1,8 @@
{ mkDerivation {
, extra-cmake-modules mkDerivation,
, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel extra-cmake-modules,
, kwindowsystem, kxmlgui boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel,
kwindowsystem, kxmlgui
}: }:
mkDerivation { mkDerivation {

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

@ -1,25 +1,18 @@
{ mkDerivation {
, extra-cmake-modules mkDerivation,
, glib extra-cmake-modules,
, gtk2 glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
, gtk3 knewstuff
, karchive
, kcmutils
, kconfigwidgets
, ki18n
, kiconthemes
, kio
, knewstuff
}: }:
mkDerivation { mkDerivation {
name = "kde-gtk-config"; name = "kde-gtk-config";
patches = [ ./0001-follow-symlinks.patch ];
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
knewstuff knewstuff
]; ];
patches = [ ./0001-follow-symlinks.patch ];
cmakeFlags = [ cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"

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

@ -4,4 +4,5 @@ mkDerivation {
name = "kdecoration"; name = "kdecoration";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
} }

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

@ -1,7 +1,8 @@
{ mkDerivation, extra-cmake-modules, kdoctools, kcmutils {
, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui mkDerivation,
, plasma-framework, plasma-workspace, qtx11extras extra-cmake-modules, kdoctools,
, fetchpatch kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui,
plasma-framework, plasma-workspace, qtx11extras
}: }:
mkDerivation { mkDerivation {
@ -11,4 +12,5 @@ mkDerivation {
kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
plasma-framework plasma-workspace qtx11extras plasma-framework plasma-workspace qtx11extras
]; ];
outputs = [ "out" "dev" "bin" ];
} }

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

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

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

@ -1,6 +1,8 @@
{ mkDerivation, extra-cmake-modules, kconfig, kconfigwidgets {
, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui mkDerivation,
, libkscreen, qtdeclarative, qtgraphicaleffects extra-cmake-modules,
kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons,
kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects
}: }:
mkDerivation { mkDerivation {

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

@ -9,8 +9,9 @@
mkDerivation { mkDerivation {
name = "kscreenlocker"; name = "kscreenlocker";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ buildInputs = [
kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
libXcursor pam plasma-framework qtdeclarative qtx11extras wayland libXcursor pam plasma-framework qtdeclarative qtx11extras wayland
]; ];
outputs = [ "out" "dev" ];
} }

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

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

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

@ -1,29 +1,34 @@
{ {
mkDerivation, lib, copyPathsToStore, mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig,
kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, xwayland,
kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem,
kxmlgui, libICE, libSM, libinput, libxkbcommon, plasma-framework, qtdeclarative, qtmultimedia, qtscript, qtx11extras,
qtdeclarative, qtmultimedia, qtscript, qtx11extras, udev, wayland,
xcb-util-cursor, xwayland breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
plasma-framework,
}: }:
mkDerivation { mkDerivation {
name = "kwin"; name = "kwin";
nativeBuildInputs = [ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
extra-cmake-modules buildInputs = [
kdoctools epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor
]; xwayland
propagatedBuildInputs = [
breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets qtdeclarative qtmultimedia qtscript qtx11extras
breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
kwayland kwidgetsaddons kwindowsystem kxmlgui libICE libSM libxkbcommon kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
libinput plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras
udev wayland xcb-util-cursor xwayland
]; ];
outputs = [ "out" "dev" "bin" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"'' ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''
@ -32,9 +37,9 @@ mkDerivation {
postInstall = '' postInstall = ''
# Some package(s) refer to these service types by the wrong name. # Some package(s) refer to these service types by the wrong name.
# I would prefer to patch those packages, but I cannot find them! # I would prefer to patch those packages, but I cannot find them!
ln -s $out/share/kservicetypes5/kwineffect.desktop \ ln -s ''${!outputBin}/share/kservicetypes5/kwineffect.desktop \
$out/share/kservicetypes5/kwin-effect.desktop ''${!outputBin}/share/kservicetypes5/kwin-effect.desktop
ln -s $out/share/kservicetypes5/kwinscript.desktop \ ln -s ''${!outputBin}/share/kservicetypes5/kwinscript.desktop \
$out/share/kservicetypes5/kwin-script.desktop ''${!outputBin}/share/kservicetypes5/kwin-script.desktop
''; '';
} }

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

@ -1,15 +1,16 @@
{ mkDerivation, lib, copyPathsToStore {
, extra-cmake-modules mkDerivation, lib, copyPathsToStore,
, kwayland, libXrandr extra-cmake-modules,
, qtx11extras kwayland, libXrandr, qtx11extras
}: }:
mkDerivation { mkDerivation {
name = "libkscreen"; name = "libkscreen";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kwayland libXrandr qtx11extras ]; buildInputs = [ kwayland libXrandr qtx11extras ];
outputs = [ "out" "dev" ];
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=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\""
''; '';
} }

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

@ -12,9 +12,10 @@ mkDerivation {
./0001-qdiriterator-follow-symlinks.patch ./0001-qdiriterator-follow-symlinks.patch
]; ];
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ buildInputs = [
kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
qtwebkit qtwebkit
]; ];
outputs = [ "out" "dev" "bin" ];
} }

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

@ -7,9 +7,7 @@
mkDerivation { mkDerivation {
name = "milou"; name = "milou";
nativeBuildInputs = [ nativeBuildInputs = [ extra-cmake-modules ];
extra-cmake-modules
];
buildInputs = [ buildInputs = [
kcoreaddons kdeclarative ki18n krunner kservice plasma-framework kcoreaddons kdeclarative ki18n krunner kservice plasma-framework
qtdeclarative qtscript qtdeclarative qtscript

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

@ -1,35 +1,37 @@
{ {
mkDerivation, lib, copyPathsToStore, mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft, xorgserver, utillinux,
libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework,
plasma-workspace, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtx11extras,
qtx11extras, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
xorgserver, attica, baloo, kactivities, kactivities-stats, kauth, kcmutils, kdbusaddons,
utillinux kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n,
kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner,
kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework,
plasma-workspace,
}: }:
mkDerivation rec { mkDerivation rec {
name = "plasma-desktop"; name = "plasma-desktop";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft
knotifications knotifyconfig kwallet libcanberra_kde libXcursor libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config
libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
xf86inputsynaptics xkeyboard_config xinput baloo kactivities qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras
kactivities-stats kauth kdeclarative kdelibs4support kemoticons kglobalaccel
ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons
qtquickcontrols qtquickcontrols2 qtx11extras ksysguard kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels
knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker
ksysguard kwallet kwin plasma-framework plasma-workspace
]; ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
postPatch = '' postPatch = ''
substituteInPlace kcms/dateandtime/helper.cpp \
--subst-var hwclock "${utillinux}/sbin/hwclock"
sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
''; '';
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
@ -37,12 +39,12 @@ mkDerivation rec {
''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"'' ''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"''
]; ];
cmakeFlags = [ cmakeFlags = [
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${lib.getDev xf86inputsynaptics}/include/xorg"
]; ];
postInstall = '' postInstall = ''
# Display ~/Desktop contents on the desktop by default. # Display ~/Desktop contents on the desktop by default.
sed -i "$out/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
-e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/' -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/'
''; '';
} }

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

@ -10,6 +10,14 @@
mkDerivation { mkDerivation {
name = "plasma-nm"; name = "plasma-nm";
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
qca-qt5 solid
];
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./0001-mobile-broadband-provider-info-path.patch; src = ./0001-mobile-broadband-provider-info-path.patch;
@ -20,12 +28,4 @@ mkDerivation {
inherit openvpn; inherit openvpn;
}) })
]; ];
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
qca-qt5 solid
];
} }

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

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

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

@ -3,13 +3,15 @@
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
isocodes, libdbusmenu, libSM, libXcursor, pam, wayland,
baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff, kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets,
kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard,
phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols, networkmanager-qt, phonon, plasma-framework, prison, solid,
qtquickcontrols2, qtscript, qtx11extras, solid, isocodes, libdbusmenu, libSM,
libXcursor, pam, wayland qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qtx11extras,
}: }:
mkDerivation { mkDerivation {
@ -18,27 +20,28 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
isocodes libdbusmenu libSM libXcursor pam wayland isocodes libdbusmenu libSM libXcursor pam wayland
];
propagatedBuildInputs = [
baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
plasma-framework solid qtgraphicaleffects qtquickcontrols qtquickcontrols2 networkmanager-qt phonon plasma-framework prison solid
qtscript qtx11extras
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtx11extras
]; ];
outputs = [ "out" "dev" "bin" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
postPatch = '' postPatch = ''
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
--replace kdostartupconfig5 $out/bin/kdostartupconfig5 --replace kdostartupconfig5 ''${!outputBin}/bin/kdostartupconfig5
''; '';
postInstall = '' postInstall = ''
rm "$out/bin/startkde" rm "''${!outputBin}/bin/startkde"
rm "$out/bin/startplasmacompositor" rm "''${!outputBin}/bin/startplasmacompositor"
rm "$out/lib/libexec/startplasma" rm "''${!outputLib}/lib/libexec/startplasma"
rm -r "$out/share/wayland-sessions" rm -r "''${!outputBin}/share/wayland-sessions"
''; '';
} }

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

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

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

@ -7,8 +7,9 @@
mkDerivation { mkDerivation {
name = "systemsettings"; name = "systemsettings";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ buildInputs = [
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
]; ];
outputs = [ "out" "dev" "bin" ];
} }