diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-25 14:32:46 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-27 11:49:28 -0600 |
commit | e50ba7041126a5a4fbc81192739e36076010beeb (patch) | |
tree | 6ca05e8286e7b2e42ffcc74fd11111bab6e2ccf1 /pkgs | |
parent | fca3f2e661fa659dc9008338b19531ad6d67c17a (diff) |
plasma5: Hide internal plasmaPackage deriver
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/plasma-5/breeze-qt4.nix | 16 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/build-support/package.nix | 27 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/default.nix | 118 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
4 files changed, 83 insertions, 85 deletions
diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix index b97554cd40441..adcc6110c4d79 100644 --- a/pkgs/desktops/plasma-5/breeze-qt4.nix +++ b/pkgs/desktops/plasma-5/breeze-qt4.nix @@ -1,20 +1,12 @@ { - stdenv, lib, src, version, + plasmaPackage, lib, automoc4, cmake, perl, pkgconfig, kdelibs4, qt4, xproto }: -stdenv.mkDerivation { - name = "breeze-qt4-${version}"; - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - inherit src; +plasmaPackage { + name = "breeze-qt4"; + sname = "breeze"; buildInputs = [ kdelibs4 qt4 xproto ]; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; cmakeFlags = [ diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix new file mode 100644 index 0000000000000..1e9ba016c4712 --- /dev/null +++ b/pkgs/desktops/plasma-5/build-support/package.nix @@ -0,0 +1,27 @@ +{ kdeDerivation, lib, fetchurl }: + +let + mirror = "mirror://kde"; + srcs = import ../srcs.nix { inherit fetchurl mirror; }; +in + +args: + +let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; +in +kdeDerivation (args // { + name = "${name}-${version}"; + inherit src; + + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + } // (args.meta or {}); +}) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index b240ef7496c67..0cb25a315d6ea 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -25,77 +25,57 @@ existing packages here and modify it as necessary. */ { - stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl, - gconf, kdeDerivation, + libsForQt5, kdeDerivation, lib, fetchurl, + gconf, debug ? false, }: let - - mirror = "mirror://kde"; - srcs = import ./srcs.nix { inherit fetchurl mirror; }; - - packages = self: with self; { - plasmaPackage = args: - let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; - in kdeDerivation (args // { - name = "${name}-${version}"; - inherit src; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); - - bluedevil = callPackage ./bluedevil.nix {}; - breeze-gtk = callPackage ./breeze-gtk.nix {}; - breeze-qt4 = callPackage ./breeze-qt4.nix { - inherit (srcs.breeze) src version; - }; - breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze-grub = callPackage ./breeze-grub.nix {}; - breeze-plymouth = callPackage ./breeze-plymouth {}; - kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; - kde-cli-tools = callPackage ./kde-cli-tools.nix {}; - kde-gtk-config = callPackage ./kde-gtk-config {}; - kdecoration = callPackage ./kdecoration.nix {}; - kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; - kgamma5 = callPackage ./kgamma5.nix {}; - khotkeys = callPackage ./khotkeys.nix {}; - kinfocenter = callPackage ./kinfocenter.nix {}; - kmenuedit = callPackage ./kmenuedit.nix {}; - kscreen = callPackage ./kscreen.nix {}; - kscreenlocker = callPackage ./kscreenlocker.nix {}; - ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksysguard = callPackage ./ksysguard.nix {}; - kwallet-pam = callPackage ./kwallet-pam.nix {}; - kwayland-integration = callPackage ./kwayland-integration.nix {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited.nix {}; - libkscreen = callPackage ./libkscreen.nix {}; - libksysguard = callPackage ./libksysguard {}; - milou = callPackage ./milou.nix {}; - oxygen = callPackage ./oxygen.nix {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-integration = callPackage ./plasma-integration.nix {}; - plasma-nm = callPackage ./plasma-nm {}; - plasma-pa = callPackage ./plasma-pa.nix { - inherit gconf; + packages = self: with self; + let + callPackage = self.newScope { + plasmaPackage = import ./build-support/package.nix { + inherit kdeDerivation lib fetchurl; + }; + }; + in { + bluedevil = callPackage ./bluedevil.nix {}; + breeze-gtk = callPackage ./breeze-gtk.nix {}; + breeze-qt4 = callPackage ./breeze-qt4.nix {}; + breeze-qt5 = callPackage ./breeze-qt5.nix {}; + breeze-grub = callPackage ./breeze-grub.nix {}; + breeze-plymouth = callPackage ./breeze-plymouth {}; + kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; + kde-cli-tools = callPackage ./kde-cli-tools.nix {}; + kde-gtk-config = callPackage ./kde-gtk-config {}; + kdecoration = callPackage ./kdecoration.nix {}; + kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; + kgamma5 = callPackage ./kgamma5.nix {}; + khotkeys = callPackage ./khotkeys.nix {}; + kinfocenter = callPackage ./kinfocenter.nix {}; + kmenuedit = callPackage ./kmenuedit.nix {}; + kscreen = callPackage ./kscreen.nix {}; + kscreenlocker = callPackage ./kscreenlocker.nix {}; + ksshaskpass = callPackage ./ksshaskpass.nix {}; + ksysguard = callPackage ./ksysguard.nix {}; + kwallet-pam = callPackage ./kwallet-pam.nix {}; + kwayland-integration = callPackage ./kwayland-integration.nix {}; + kwin = callPackage ./kwin {}; + kwrited = callPackage ./kwrited.nix {}; + libkscreen = callPackage ./libkscreen.nix {}; + libksysguard = callPackage ./libksysguard {}; + milou = callPackage ./milou.nix {}; + oxygen = callPackage ./oxygen.nix {}; + plasma-desktop = callPackage ./plasma-desktop {}; + plasma-integration = callPackage ./plasma-integration.nix {}; + plasma-nm = callPackage ./plasma-nm {}; + plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-workspace = callPackage ./plasma-workspace {}; + plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; + polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; + powerdevil = callPackage ./powerdevil.nix {}; + startkde = callPackage ./startkde {}; + systemsettings = callPackage ./systemsettings.nix {}; }; - plasma-workspace = callPackage ./plasma-workspace {}; - plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; - polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; - powerdevil = callPackage ./powerdevil.nix {}; - startkde = callPackage ./startkde {}; - systemsettings = callPackage ./systemsettings.nix {}; - }; - -in lib.makeScope libsForQt5.newScope packages +in +lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6204602e96a15..d310c50e0352f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16822,11 +16822,10 @@ with pkgs; pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; }; - plasma5 = import ../desktops/plasma-5 { - inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl; - inherit kdeDerivation; + plasma5 = recurseIntoAttrs (import ../desktops/plasma-5 { + inherit libsForQt5 kdeDerivation lib fetchurl; inherit (gnome3) gconf; - }; + }); redshift = callPackage ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg; |