plasma54: don't override mkDerivation

Provides a globally unique name (plasmaPackage) instead of using
attribute paths as namespaces and locally overloading the mkDerivation
name.

pkgs/desktops/plasma-5.4/bluedevil.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , bluez-qt
 , kcoreaddons
@@ -15,7 +15,7 @@
 , shared_mime_info
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "bluedevil";
   nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
   buildInputs = [

pkgs/desktops/plasma-5.4/breeze-qt4.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , automoc4
 , cmake
 , perl
@@ -8,7 +8,7 @@
 , xproto
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "breeze-qt4";
   sname = "breeze";
   buildInputs = [

pkgs/desktops/plasma-5.4/breeze-qt5.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , frameworkintegration
 , kcmutils
@@ -11,7 +11,7 @@
 , qtx11extras
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "breeze-qt5";
   sname = "breeze";
   nativeBuildInputs = [

pkgs/desktops/plasma-5.4/default.nix

@@ -17,13 +17,12 @@ let
   srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
   mirror = "mirror://kde";
 
-  mkDerivation = args:
+  plasmaPackage = args:
     let
-      inherit (stdenv) mkDerivation;
       inherit (args) name;
       sname = args.sname or name;
       inherit (srcs."${sname}") src version;
-    in mkDerivation (args // {
+    in stdenv.mkDerivation (args // {
       name = "${name}-${version}";
       inherit src;
 
@@ -82,6 +81,6 @@ let
     systemsettings = callPackage ./systemsettings.nix {};
   };
 
-  newScope = scope: kdeApps.newScope ({ inherit mkDerivation; } // scope);
+  newScope = scope: kdeApps.newScope ({ inherit plasmaPackage; } // scope);
 
 in lib.makeScope newScope addPackages

pkgs/desktops/plasma-5.4/kde-cli-tools.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kcmutils
 , kconfig
@@ -12,7 +12,7 @@
 , qtx11extras
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [

pkgs/desktops/plasma-5.4/kde-gtk-config.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , glib
 , gtk2
@@ -12,7 +12,7 @@
 , knewstuff
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "kde-gtk-config";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [

pkgs/desktops/plasma-5.4/kdecoration.nix

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

pkgs/desktops/plasma-5.4/kdeplasma-addons.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , ibus
@@ -19,7 +19,7 @@
 , qtx11extras
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "kdeplasma-addons";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/kgamma5.nix

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

pkgs/desktops/plasma-5.4/khelpcenter.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , kconfig
@@ -12,7 +12,7 @@
 , kservice
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "khelpcenter";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/khotkeys.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , kcmutils
@@ -13,7 +13,7 @@
 , qtx11extras
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "khotkeys";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/kinfocenter.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , kcmutils
@@ -21,7 +21,7 @@
 , solid
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "kinfocenter";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/kmenuedit.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , ki18n
@@ -10,7 +10,7 @@
 , kdelibs4support
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "kmenuedit";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/kscreen.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kconfig
 , kconfigwidgets
@@ -11,7 +11,7 @@
 , qtdeclarative
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "kscreen";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/ksshaskpass.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , kcoreaddons
@@ -7,7 +7,7 @@
 , kwidgetsaddons
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "ksshaskpass";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/ksysguard.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , kconfig
@@ -11,7 +11,7 @@
 , libksysguard
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "ksysguard";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/kwayland.nix

@@ -1,9 +1,9 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , wayland
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "kwayland";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/kwin/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , epoxy
@@ -36,7 +36,7 @@
 , xcb-util-cursor
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "kwin";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/kwrited.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kcoreaddons
 , ki18n
@@ -7,7 +7,7 @@
 , kdbusaddons
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "kwrited";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/libkscreen/default.nix

@@ -1,10 +1,10 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , libXrandr
 , qtx11extras
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "libkscreen";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/libksysguard.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kauth
 , kcompletion
@@ -16,7 +16,7 @@
 , kiconthemes
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "libksysguard";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/milou.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , qtscript
 , qtdeclarative
@@ -10,7 +10,7 @@
 , krunner
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "milou";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/oxygen-fonts.nix

@@ -1,9 +1,9 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , fontforge
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "oxygen-fonts";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/oxygen.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , ki18n
 , kcmutils
@@ -13,7 +13,7 @@
 , qtx11extras
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "oxygen";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/plasma-desktop/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , substituteAll
 , extra-cmake-modules
 , kdoctools
@@ -43,7 +43,7 @@
 , utillinux
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "plasma-desktop";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/plasma-mediacenter.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , baloo
 , kactivities
@@ -16,7 +16,7 @@
 , taglib
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "plasma-mediacenter";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/plasma-nm.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , kcompletion
@@ -27,7 +27,7 @@
 , solid
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "plasma-nm";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/plasma-pa.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , glib
 , kconfigwidgets
@@ -10,7 +10,7 @@
 , plasma-framework
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "plasma-pa";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix

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

pkgs/desktops/plasma-5.4/plasma-workspace/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , baloo
@@ -53,7 +53,7 @@
 , xsetroot
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "plasma-workspace";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/polkit-kde-agent.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , ki18n
 , kwindowsystem
@@ -12,7 +12,7 @@
 , polkitQt
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "polkit-kde-agent";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/powerdevil.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , kactivities
@@ -18,7 +18,7 @@
 , udev
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "powerdevil";
   nativeBuildInputs = [
     extra-cmake-modules

pkgs/desktops/plasma-5.4/systemsettings.nix

@@ -1,4 +1,4 @@
-{ mkDerivation
+{ plasmaPackage
 , extra-cmake-modules
 , kdoctools
 , kitemviews
@@ -14,7 +14,7 @@
 , khtml
 }:
 
-mkDerivation {
+plasmaPackage {
   name = "systemsettings";
   nativeBuildInputs = [
     extra-cmake-modules