plasma5: rename name to pname

2 years ago · e728776b56
parent 9df2200638
commit e728776b56
50 changed files with 52 additions and 53 deletions
--- 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
--- 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

--- 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 = [
--- 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 = [
--- 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 = [
--- 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;
          });
      };

--- 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
--- 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
--- 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
--- 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 = [
--- 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" ];
--- 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
--- 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 ];
 }
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 ];
 }
--- 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 ];
--- 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 = ''
--- 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 ];
 }
--- 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
--- 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
--- 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 ];
 }
--- 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 ];
 }
--- 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" ];
--- 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
  ];
--- 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
--- 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
--- 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
  ];
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 = [
--- 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
--- 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
--- 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
--- 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 = [
--- 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 ];
 }
--- 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 ];
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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