From e728776b560fe8062d02f6abc4ea0628c7aea7bb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 6 Mar 2022 22:28:56 +0100 Subject: [PATCH] plasma5: rename name to pname --- pkgs/desktops/plasma-5/bluedevil.nix | 2 +- pkgs/desktops/plasma-5/breeze-grub.nix | 2 +- pkgs/desktops/plasma-5/breeze-gtk.nix | 2 +- pkgs/desktops/plasma-5/breeze-plymouth/default.nix | 2 +- pkgs/desktops/plasma-5/breeze-qt5.nix | 2 +- pkgs/desktops/plasma-5/default.nix | 7 +++---- pkgs/desktops/plasma-5/discover.nix | 2 +- pkgs/desktops/plasma-5/kactivitymanagerd.nix | 2 +- pkgs/desktops/plasma-5/kde-cli-tools.nix | 2 +- pkgs/desktops/plasma-5/kde-gtk-config/default.nix | 2 +- pkgs/desktops/plasma-5/kdecoration.nix | 2 +- pkgs/desktops/plasma-5/kdeplasma-addons.nix | 2 +- pkgs/desktops/plasma-5/kgamma5.nix | 2 +- pkgs/desktops/plasma-5/khotkeys.nix | 2 +- pkgs/desktops/plasma-5/kinfocenter.nix | 2 +- pkgs/desktops/plasma-5/kmenuedit.nix | 2 +- pkgs/desktops/plasma-5/kscreen.nix | 2 +- pkgs/desktops/plasma-5/kscreenlocker.nix | 2 +- pkgs/desktops/plasma-5/ksshaskpass.nix | 2 +- pkgs/desktops/plasma-5/ksystemstats.nix | 2 +- pkgs/desktops/plasma-5/kwallet-pam.nix | 2 +- pkgs/desktops/plasma-5/kwayland-integration.nix | 2 +- pkgs/desktops/plasma-5/kwayland-server/default.nix | 2 +- pkgs/desktops/plasma-5/kwin/default.nix | 2 +- pkgs/desktops/plasma-5/kwrited.nix | 2 +- pkgs/desktops/plasma-5/layer-shell-qt.nix | 2 +- pkgs/desktops/plasma-5/libkscreen/default.nix | 2 +- pkgs/desktops/plasma-5/libksysguard/default.nix | 2 +- pkgs/desktops/plasma-5/milou.nix | 2 +- pkgs/desktops/plasma-5/oxygen.nix | 2 +- pkgs/desktops/plasma-5/plasma-browser-integration.nix | 2 +- pkgs/desktops/plasma-5/plasma-desktop/default.nix | 2 +- pkgs/desktops/plasma-5/plasma-disks.nix | 2 +- pkgs/desktops/plasma-5/plasma-integration/default.nix | 2 +- pkgs/desktops/plasma-5/plasma-nano/default.nix | 2 +- pkgs/desktops/plasma-5/plasma-nm/default.nix | 2 +- pkgs/desktops/plasma-5/plasma-pa.nix | 2 +- pkgs/desktops/plasma-5/plasma-phone-components/default.nix | 2 +- pkgs/desktops/plasma-5/plasma-sdk.nix | 2 +- pkgs/desktops/plasma-5/plasma-systemmonitor.nix | 2 +- pkgs/desktops/plasma-5/plasma-thunderbolt.nix | 2 +- pkgs/desktops/plasma-5/plasma-vault/default.nix | 2 +- pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix | 2 +- pkgs/desktops/plasma-5/plasma-workspace/default.nix | 2 +- pkgs/desktops/plasma-5/polkit-kde-agent.nix | 2 +- pkgs/desktops/plasma-5/powerdevil.nix | 2 +- pkgs/desktops/plasma-5/qqc2-breeze-style.nix | 2 +- pkgs/desktops/plasma-5/sddm-kcm.nix | 2 +- pkgs/desktops/plasma-5/systemsettings.nix | 2 +- pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 2 +- 50 files changed, 52 insertions(+), 53 deletions(-) diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index db1e46f6d4e8..0474d875997f 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "bluedevil"; + pname = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase qtdeclarative bluez-qt diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix index eed396b54375..24d0c96cad97 100644 --- a/pkgs/desktops/plasma-5/breeze-grub.nix +++ b/pkgs/desktops/plasma-5/breeze-grub.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "breeze-grub"; + pname = "breeze-grub"; installPhase = '' runHook preInstall diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index bff3546aa330..b499ab034e50 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -3,7 +3,7 @@ let inherit (lib) getLib; in mkDerivation { - name = "breeze-gtk"; + pname = "breeze-gtk"; nativeBuildInputs = [ extra-cmake-modules sassc python3 python3.pkgs.pycairo breeze-qt5 ]; buildInputs = [ qtbase ]; patches = [ diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index 9127b7fecb6e..bc60662b434a 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -24,7 +24,7 @@ in mkDerivation { - name = "breeze-plymouth"; + pname = "breeze-plymouth"; nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ]; buildInputs = [ plymouth ]; patches = [ diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index 3f3222e05cdb..13a426bb2587 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "breeze-qt5"; + pname = "breeze-qt5"; sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 072d999b1a92..0b713902358c 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -76,8 +76,8 @@ let mkDerivation = args: let - inherit (args) name; - sname = args.sname or name; + inherit (args) pname; + sname = args.sname or pname; inherit (srcs.${sname}) src version; outputs = args.outputs or [ "out" ]; @@ -98,8 +98,7 @@ let }; in mkDerivation (args // { - name = "${name}-${version}"; - inherit meta outputs setupHook src; + inherit pname version meta outputs setupHook src; }); }; diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index e065837cd2fd..dd6c7a3008ca 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -32,7 +32,7 @@ }: mkDerivation { - name = "discover"; + pname = "discover"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ]; buildInputs = [ # discount is needed for libmarkdown diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 47543da11144..57800c316aa7 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kactivitymanagerd"; + pname = "kactivitymanagerd"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index d84b7bc98019..02694b085f89 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kde-cli-tools"; + pname = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 798f8d807af1..6949f73a9ce7 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kde-gtk-config"; + pname = "kde-gtk-config"; nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; dontWrapGApps = true; # There is nothing to wrap buildInputs = [ diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 9b67d7bc5293..1427997ee847 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, qtbase, ki18n }: mkDerivation { - name = "kdecoration"; + pname = "kdecoration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ki18n ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 77e3cad8d487..5be47327d723 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kdeplasma-addons"; + pname = "kdeplasma-addons"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index d371ce815107..be5b191c3de7 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kgamma5"; + pname = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index fd366443861b..dfd5d4668a22 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "khotkeys"; + pname = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index e9b9f5148164..662662cdb2fd 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kinfocenter"; + pname = "kinfocenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix index c0cfebcdc0c2..6a9d055abe43 100644 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ b/pkgs/desktops/plasma-5/kmenuedit.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kmenuedit"; + pname = "kmenuedit"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdbusaddons khotkeys ki18n kiconthemes kio kxmlgui sonnet diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 11b0f38fed05..36eea905739e 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kscreen"; + pname = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index e6c70f8e8cc2..b37bbc6c8456 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kscreenlocker"; + pname = "kscreenlocker"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index bc6702ed6d3f..4cbf08044934 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ksshaskpass"; + pname = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ]; } diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix index f117872ce5c4..d5f96e42981b 100644 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "ksystemstats"; + pname = "ksystemstats"; NIX_CFLAGS_COMPILE = [ "-I${lib.getBin libksysguard}/share" ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ]; diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 590c523e9d74..dcc139bcafdf 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }: mkDerivation { - name = "kwallet-pam"; + pname = "kwallet-pam"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ pam socat libgcrypt qtbase kwallet ]; postPatch = '' diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 02e963ba9049..5462814e8de2 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kwayland-integration"; + pname = "kwayland-integration"; nativeBuildInputs = [ extra-cmake-modules wayland-scanner ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-protocols wayland ]; } diff --git a/pkgs/desktops/plasma-5/kwayland-server/default.nix b/pkgs/desktops/plasma-5/kwayland-server/default.nix index f24e0e6d6a04..e71b98b1b946 100644 --- a/pkgs/desktops/plasma-5/kwayland-server/default.nix +++ b/pkgs/desktops/plasma-5/kwayland-server/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kwayland-server"; + pname = "kwayland-server"; nativeBuildInputs = [ cmake extra-cmake-modules #kdoctools diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 36f0da9e9611..db0485db8873 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -18,7 +18,7 @@ # TODO (ttuegel): investigate qmlplugindump failure mkDerivation { - name = "kwin"; + pname = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index bb8798d2d0e0..9ba1afaf9f83 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kwrited"; + pname = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ]; } diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix index 9e18bbb4bff5..812637795531 100644 --- a/pkgs/desktops/plasma-5/layer-shell-qt.nix +++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "layer-shell-qt"; + pname = "layer-shell-qt"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-scanner wayland wayland-protocols ]; } diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index ae623a80d7d9..6798a2cdcb0e 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "libkscreen"; + pname = "libkscreen"; nativeBuildInputs = [ extra-cmake-modules wayland-scanner ]; buildInputs = [ kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 19bbc6390c98..ef4e44384448 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "libksysguard"; + pname = "libksysguard"; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 0e7169abf6f6..8ae5061436d1 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "milou"; + pname = "milou"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 6eea3c923197..78603c3c306a 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "oxygen"; + pname = "oxygen"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix index e9ad3c28c101..1ddd844444d8 100644 --- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "plasma-browser-integration"; + pname = "plasma-browser-integration"; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 457902ad1855..6c8d8a3bc4b6 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -17,7 +17,7 @@ }: mkDerivation { - name = "plasma-desktop"; + pname = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix index f97b061292a5..8ddd53548e75 100644 --- a/pkgs/desktops/plasma-5/plasma-disks.nix +++ b/pkgs/desktops/plasma-5/plasma-disks.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "plasma-disks"; + pname = "plasma-disks"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix index f69644287624..9febc5172d48 100644 --- a/pkgs/desktops/plasma-5/plasma-integration/default.nix +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -8,7 +8,7 @@ # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration mkDerivation { - name = "plasma-integration"; + pname = "plasma-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix index 0960eec33f2d..6e2608c7f97b 100644 --- a/pkgs/desktops/plasma-5/plasma-nano/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nano/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "plasma-nano"; + pname = "plasma-nano"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-framework diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 5c82112f3b15..54c8079cf5f4 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -11,7 +11,7 @@ }: mkDerivation { - name = "plasma-nm"; + pname = "plasma-nm"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index bc39e520f8a6..9e47356579e3 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "plasma-pa"; + pname = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop diff --git a/pkgs/desktops/plasma-5/plasma-phone-components/default.nix b/pkgs/desktops/plasma-5/plasma-phone-components/default.nix index d925d7e408b5..ed0f434025d2 100644 --- a/pkgs/desktops/plasma-5/plasma-phone-components/default.nix +++ b/pkgs/desktops/plasma-5/plasma-phone-components/default.nix @@ -16,7 +16,7 @@ let inherit (lib) getBin getLib; in mkDerivation { - name = "plasma-phone-components"; + pname = "plasma-phone-components"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/desktops/plasma-5/plasma-sdk.nix b/pkgs/desktops/plasma-5/plasma-sdk.nix index e82fc4d0602c..8ab2d635b28d 100644 --- a/pkgs/desktops/plasma-5/plasma-sdk.nix +++ b/pkgs/desktops/plasma-5/plasma-sdk.nix @@ -20,7 +20,7 @@ }: mkDerivation { - name = "plasma-sdk"; + pname = "plasma-sdk"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix index f69808bf4528..da5ad45df9cb 100644 --- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix +++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix @@ -15,7 +15,7 @@ }: mkDerivation { - name = "plasma-systemmonitor"; + pname = "plasma-systemmonitor"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtquickcontrols2 diff --git a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix index 1bb79c327ebf..c35f1bf09701 100644 --- a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix +++ b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "plasma-thunderbolt"; + pname = "plasma-thunderbolt"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcmutils diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix index 453ba2b107a1..b6ceb37a71ff 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/default.nix +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -14,7 +14,7 @@ }: mkDerivation { - name = "plasma-vault"; + pname = "plasma-vault"; nativeBuildInputs = [ extra-cmake-modules ]; patches = [ diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix index cb068166c1d9..8ae136ac78ba 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix @@ -1,6 +1,6 @@ { mkDerivation , extra-cmake-modules }: mkDerivation { - name = "plasma-workspace-wallpapers"; + pname = "plasma-workspace-wallpapers"; nativeBuildInputs = [ extra-cmake-modules ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index fac10cf31d41..68b6d1d675fe 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -23,7 +23,7 @@ let inherit (lib) getBin getLib; in mkDerivation { - name = "plasma-workspace"; + pname = "plasma-workspace"; passthru.providedSessions = [ "plasma" "plasmawayland" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 72217204b35d..82ebf3e31365 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "polkit-kde-agent"; + pname = "polkit-kde-agent"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index 9d2dc183cf16..229810edde1d 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "powerdevil"; + pname = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth diff --git a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix index 420529eb1749..a45488c287d2 100644 --- a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix +++ b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix @@ -12,7 +12,7 @@ }: mkDerivation { - name = "qqc2-breeze-style"; + pname = "qqc2-breeze-style"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 7c44e0f140d4..50801d31774b 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -17,7 +17,7 @@ }: mkDerivation { - name = "sddm-kcm"; + pname = "sddm-kcm"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 9ff906f79745..c83bbcecf567 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "systemsettings"; + pname = "systemsettings"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 60d4867cb47f..00533367d4ce 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "xdg-desktop-portal-kde"; + pname = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ cups libepoxy mesa pcre pipewire wayland wayland-protocols