public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde4: Use lib.makeScope

Browse Source
This commit is contained in:
Thomas Tuegel 2017-02-18 11:54:07 -06:00
parent 53a2baabbe
commit 68baf639a1
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 174 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkgs/top-level/all-packages.nix
View File

@ -16674,34 +16674,31 @@ with pkgs;
kakasi = callPackage ../tools/text/kakasi { }; kakasi = callPackage ../tools/text/kakasi { };
kde4 = recurseIntoAttrs pkgs.kde414; kde4 =
let
kde414 = deps = lib.makeScope newScope (self: {
kdePackagesFor
{
libusb = libusb1; libusb = libusb1;
python2Packages = python2Packages; python2Packages = python2Packages;
inherit (python2Packages) python; inherit (python2Packages) python;
libcanberra = libcanberra_kde;
boost = boost155;
kdelibs = kde5.kdelibs; kdelibs = kde5.kdelibs;
subversionClient = pkgs.subversion18.override { boost = boost155;
subversionClient = subversion18.override {
bdbSupport = false; bdbSupport = false;
perlBindings = true; perlBindings = true;
pythonBindings = true; pythonBindings = true;
}; };
ruby = ruby_2_2; # see https://github.com/NixOS/nixpkgs/pull/12610#issuecomment-188666473 ruby = ruby_2_2; # see https://github.com/NixOS/nixpkgs/pull/12610#issuecomment-188666473
ffmpeg = ffmpeg_2; # ffmpegthumb doesn't build otherwise ffmpeg = ffmpeg_2; # ffmpegthumb doesn't build otherwise
} });
../desktops/kde-4.14;
self = lib.makeScope deps.newScope (self: with self;
(deps.callPackage ../desktops/kde-4.14 {
callPackageOrig = pkgs.callPackage;
inherit (self) callPackage;
}) // {
libcanberra = libcanberra_kde;
kdePackagesFor = extra: dir:
let
# list of extra packages not included in KDE
# the real work in this function is done below this list
extraPackages = callPackage:
rec {
amarok = callPackage ../applications/audio/amarok { amarok = callPackage ../applications/audio/amarok {
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
}; };
@ -16762,6 +16759,8 @@ with pkgs;
konversation = callPackage ../applications/networking/irc/konversation { }; konversation = callPackage ../applications/networking/irc/konversation { };
ktikz = callPackage ../applications/graphics/ktikz { };
kvirc = callPackage ../applications/networking/irc/kvirc { }; kvirc = callPackage ../applications/networking/irc/kvirc { };
krename = callPackage ../applications/misc/krename/kde4.nix { krename = callPackage ../applications/misc/krename/kde4.nix {
@ -16798,6 +16797,8 @@ with pkgs;
polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
psi = callPackage ../applications/networking/instant-messengers/psi { };
qtcurve = callPackage ../misc/themes/qtcurve { }; qtcurve = callPackage ../misc/themes/qtcurve { };
quassel = callPackage ../applications/networking/irc/quassel rec { quassel = callPackage ../applications/networking/irc/quassel rec {
@ -16861,25 +16862,9 @@ with pkgs;
zanshin = callPackage ../applications/office/zanshin { }; zanshin = callPackage ../applications/office/zanshin { };
kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
}; });
callPackageOrig = newScope extra; in recurseIntoAttrs self;
makePackages = extra:
let
callPackage = newScope (extra // self);
kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; };
self =
kde4
// extraPackages callPackage
// {
inherit kde4;
wrapper = callPackage ../build-support/kdewrapper {};
recurseForRelease = true;
};
in self;
in makeOverridable makePackages extra;
lumina = callPackage ../desktops/lumina { }; lumina = callPackage ../desktops/lumina { };