pyrox.dev / nixpkgs
lol
fork atom

plasma54: don't override mkDerivation

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

Thomas Tuegel 8e9fca18 5ba93bd4

+67 -68
unified split
+2 -2
pkgs/desktops/plasma-5.4/bluedevil.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , bluez-qt 4 4 , kcoreaddons ··· 15 15 , shared_mime_info 16 16 }: 17 17 18 - mkDerivation { 18 + plasmaPackage { 19 19 name = "bluedevil"; 20 20 nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; 21 21 buildInputs = [
+2 -2
pkgs/desktops/plasma-5.4/breeze-qt4.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , automoc4 3 3 , cmake 4 4 , perl ··· 8 8 , xproto 9 9 }: 10 10 11 - mkDerivation { 11 + plasmaPackage { 12 12 name = "breeze-qt4"; 13 13 sname = "breeze"; 14 14 buildInputs = [
+2 -2
pkgs/desktops/plasma-5.4/breeze-qt5.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , frameworkintegration 4 4 , kcmutils ··· 11 11 , qtx11extras 12 12 }: 13 13 14 - mkDerivation { 14 + plasmaPackage { 15 15 name = "breeze-qt5"; 16 16 sname = "breeze"; 17 17 nativeBuildInputs = [
+3 -4
pkgs/desktops/plasma-5.4/default.nix
··· 17 17 srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; 18 18 mirror = "mirror://kde"; 19 19 20 - mkDerivation = args: 20 + plasmaPackage = args: 21 21 let 22 - inherit (stdenv) mkDerivation; 23 22 inherit (args) name; 24 23 sname = args.sname or name; 25 24 inherit (srcs."${sname}") src version; 26 - in mkDerivation (args // { 25 + in stdenv.mkDerivation (args // { 27 26 name = "${name}-${version}"; 28 27 inherit src; 29 28 ··· 82 81 systemsettings = callPackage ./systemsettings.nix {}; 83 82 }; 84 83 85 - newScope = scope: kdeApps.newScope ({ inherit mkDerivation; } // scope); 84 + newScope = scope: kdeApps.newScope ({ inherit plasmaPackage; } // scope); 86 85 87 86 in lib.makeScope newScope addPackages
+2 -2
pkgs/desktops/plasma-5.4/kde-cli-tools.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kcmutils 4 4 , kconfig ··· 12 12 , qtx11extras 13 13 }: 14 14 15 - mkDerivation { 15 + plasmaPackage { 16 16 name = "kde-cli-tools"; 17 17 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 18 18 buildInputs = [
+2 -2
pkgs/desktops/plasma-5.4/kde-gtk-config.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , glib 4 4 , gtk2 ··· 12 12 , knewstuff 13 13 }: 14 14 15 - mkDerivation { 15 + plasmaPackage { 16 16 name = "kde-gtk-config"; 17 17 nativeBuildInputs = [ extra-cmake-modules ]; 18 18 buildInputs = [
+2 -2
pkgs/desktops/plasma-5.4/kdecoration.nix
··· 1 - { mkDerivation, extra-cmake-modules }: 1 + { plasmaPackage, extra-cmake-modules }: 2 2 3 - mkDerivation { 3 + plasmaPackage { 4 4 name = "kdecoration"; 5 5 nativeBuildInputs = [ extra-cmake-modules ]; 6 6 }
+2 -2
pkgs/desktops/plasma-5.4/kdeplasma-addons.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , ibus ··· 19 19 , qtx11extras 20 20 }: 21 21 22 - mkDerivation { 22 + plasmaPackage { 23 23 name = "kdeplasma-addons"; 24 24 nativeBuildInputs = [ 25 25 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/kgamma5.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , kdelibs4support 5 5 , qtx11extras 6 6 }: 7 7 8 - mkDerivation { 8 + plasmaPackage { 9 9 name = "kgamma5"; 10 10 nativeBuildInputs = [ 11 11 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/khelpcenter.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , kconfig ··· 12 12 , kservice 13 13 }: 14 14 15 - mkDerivation { 15 + plasmaPackage { 16 16 name = "khelpcenter"; 17 17 nativeBuildInputs = [ 18 18 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/khotkeys.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , kcmutils ··· 13 13 , qtx11extras 14 14 }: 15 15 16 - mkDerivation { 16 + plasmaPackage { 17 17 name = "khotkeys"; 18 18 nativeBuildInputs = [ 19 19 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/kinfocenter.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , kcmutils ··· 21 21 , solid 22 22 }: 23 23 24 - mkDerivation { 24 + plasmaPackage { 25 25 name = "kinfocenter"; 26 26 nativeBuildInputs = [ 27 27 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/kmenuedit.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , ki18n ··· 10 10 , kdelibs4support 11 11 }: 12 12 13 - mkDerivation { 13 + plasmaPackage { 14 14 name = "kmenuedit"; 15 15 nativeBuildInputs = [ 16 16 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/kscreen.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kconfig 4 4 , kconfigwidgets ··· 11 11 , qtdeclarative 12 12 }: 13 13 14 - mkDerivation { 14 + plasmaPackage { 15 15 name = "kscreen"; 16 16 nativeBuildInputs = [ 17 17 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/ksshaskpass.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , kcoreaddons ··· 7 7 , kwidgetsaddons 8 8 }: 9 9 10 - mkDerivation { 10 + plasmaPackage { 11 11 name = "ksshaskpass"; 12 12 nativeBuildInputs = [ 13 13 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/ksysguard.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , kconfig ··· 11 11 , libksysguard 12 12 }: 13 13 14 - mkDerivation { 14 + plasmaPackage { 15 15 name = "ksysguard"; 16 16 nativeBuildInputs = [ 17 17 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/kwayland.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , wayland 4 4 }: 5 5 6 - mkDerivation { 6 + plasmaPackage { 7 7 name = "kwayland"; 8 8 nativeBuildInputs = [ 9 9 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/kwin/default.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , epoxy ··· 36 36 , xcb-util-cursor 37 37 }: 38 38 39 - mkDerivation { 39 + plasmaPackage { 40 40 name = "kwin"; 41 41 nativeBuildInputs = [ 42 42 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/kwrited.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kcoreaddons 4 4 , ki18n ··· 7 7 , kdbusaddons 8 8 }: 9 9 10 - mkDerivation { 10 + plasmaPackage { 11 11 name = "kwrited"; 12 12 nativeBuildInputs = [ 13 13 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/libkscreen/default.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , libXrandr 4 4 , qtx11extras 5 5 }: 6 6 7 - mkDerivation { 7 + plasmaPackage { 8 8 name = "libkscreen"; 9 9 nativeBuildInputs = [ 10 10 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/libksysguard.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kauth 4 4 , kcompletion ··· 16 16 , kiconthemes 17 17 }: 18 18 19 - mkDerivation { 19 + plasmaPackage { 20 20 name = "libksysguard"; 21 21 nativeBuildInputs = [ 22 22 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/milou.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , qtscript 4 4 , qtdeclarative ··· 10 10 , krunner 11 11 }: 12 12 13 - mkDerivation { 13 + plasmaPackage { 14 14 name = "milou"; 15 15 nativeBuildInputs = [ 16 16 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/oxygen-fonts.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , fontforge 4 4 }: 5 5 6 - mkDerivation { 6 + plasmaPackage { 7 7 name = "oxygen-fonts"; 8 8 nativeBuildInputs = [ 9 9 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/oxygen.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , ki18n 4 4 , kcmutils ··· 13 13 , qtx11extras 14 14 }: 15 15 16 - mkDerivation { 16 + plasmaPackage { 17 17 name = "oxygen"; 18 18 nativeBuildInputs = [ 19 19 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , substituteAll 3 3 , extra-cmake-modules 4 4 , kdoctools ··· 43 43 , utillinux 44 44 }: 45 45 46 - mkDerivation { 46 + plasmaPackage { 47 47 name = "plasma-desktop"; 48 48 nativeBuildInputs = [ 49 49 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/plasma-mediacenter.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , baloo 4 4 , kactivities ··· 16 16 , taglib 17 17 }: 18 18 19 - mkDerivation { 19 + plasmaPackage { 20 20 name = "plasma-mediacenter"; 21 21 nativeBuildInputs = [ 22 22 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/plasma-nm.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , kcompletion ··· 27 27 , solid 28 28 }: 29 29 30 - mkDerivation { 30 + plasmaPackage { 31 31 name = "plasma-nm"; 32 32 nativeBuildInputs = [ 33 33 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/plasma-pa.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , glib 4 4 , kconfigwidgets ··· 10 10 , plasma-framework 11 11 }: 12 12 13 - mkDerivation { 13 + plasmaPackage { 14 14 name = "plasma-pa"; 15 15 nativeBuildInputs = [ 16 16 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 }: 4 4 5 - mkDerivation { 5 + plasmaPackage { 6 6 name = "plasma-workspace-wallpapers"; 7 7 nativeBuildInputs = [ 8 8 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , baloo ··· 53 53 , xsetroot 54 54 }: 55 55 56 - mkDerivation { 56 + plasmaPackage { 57 57 name = "plasma-workspace"; 58 58 nativeBuildInputs = [ 59 59 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/polkit-kde-agent.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , ki18n 4 4 , kwindowsystem ··· 12 12 , polkitQt 13 13 }: 14 14 15 - mkDerivation { 15 + plasmaPackage { 16 16 name = "polkit-kde-agent"; 17 17 nativeBuildInputs = [ 18 18 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/powerdevil.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , kactivities ··· 18 18 , udev 19 19 }: 20 20 21 - mkDerivation { 21 + plasmaPackage { 22 22 name = "powerdevil"; 23 23 nativeBuildInputs = [ 24 24 extra-cmake-modules
+2 -2
pkgs/desktops/plasma-5.4/systemsettings.nix
··· 1 - { mkDerivation 1 + { plasmaPackage 2 2 , extra-cmake-modules 3 3 , kdoctools 4 4 , kitemviews ··· 14 14 , khtml 15 15 }: 16 16 17 - mkDerivation { 17 + plasmaPackage { 18 18 name = "systemsettings"; 19 19 nativeBuildInputs = [ 20 20 extra-cmake-modules