diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-16 09:44:07 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-16 10:22:43 -0600 |
commit | cc058eff7052be3e2cfdfc2eef5203521e34444e (patch) | |
tree | 50243424ac50fe6df01c94e0128d58ae45695960 /pkgs/desktops | |
parent | da89338993f649eb342df5a8e29f5c009126514a (diff) | |
download | nixlib-cc058eff7052be3e2cfdfc2eef5203521e34444e.tar nixlib-cc058eff7052be3e2cfdfc2eef5203521e34444e.tar.gz nixlib-cc058eff7052be3e2cfdfc2eef5203521e34444e.tar.bz2 nixlib-cc058eff7052be3e2cfdfc2eef5203521e34444e.tar.lz nixlib-cc058eff7052be3e2cfdfc2eef5203521e34444e.tar.xz nixlib-cc058eff7052be3e2cfdfc2eef5203521e34444e.tar.zst nixlib-cc058eff7052be3e2cfdfc2eef5203521e34444e.zip |
kde5_latest: merge all package sets
The three KDE package sets now have circular dependencies between them, so they can only be built if they are merged into a single package set during evaluation.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/plasma-5.5/default.nix | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix index 812c70c2b004..c9fcbdd8e6a0 100644 --- a/pkgs/desktops/plasma-5.5/default.nix +++ b/pkgs/desktops/plasma-5.5/default.nix @@ -16,33 +16,33 @@ let srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; mirror = "mirror://kde"; - plasmaPackage = args: - let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; + packages = self: with self; { + plasmaPackage = args: + let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; + in stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; - setupHook = args.setupHook or ./setup-hook.sh; + setupHook = args.setupHook or ./setup-hook.sh; - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - 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 {}); - }); + 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 {}); + }); - addPackages = self: with self; { bluedevil = callPackage ./bluedevil.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {}; breeze-qt4 = callPackage ./breeze-qt4.nix {}; @@ -81,6 +81,4 @@ let systemsettings = callPackage ./systemsettings.nix {}; }; - newScope = scope: kdeApps.newScope ({ inherit plasmaPackage; } // scope); - -in lib.makeScope newScope addPackages +in packages |