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

kde4: fix override

Browse Source
This commit is contained in:
Thomas Tuegel 2015-03-24 13:52:47 -05:00
parent b4830add94
commit d3500f67c9
1 changed files with 133 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12851,27 +12851,23 @@ let
kde4 = recurseIntoAttrs pkgs.kde414; kde4 = recurseIntoAttrs pkgs.kde414;
kde414 = kdePackagesFor (pkgs.kde414 // { kde414 =
kdePackagesFor
{
libusb = libusb1; libusb = libusb1;
libcanberra = libcanberra_kde; libcanberra = libcanberra_kde;
boost = boost156; boost = boost156;
}) ../desktops/kde-4.14;
kdePackagesFor = self: dir:
let callPackageOrig = newScope { cmake = cmake-3_2; }; in
let
callPackage = newScope (self // { cmake = cmake-3_2; });
kde4 = callPackageOrig dir {
inherit callPackage callPackageOrig;
kdelibs = kdeApps_stable.kdelibs; kdelibs = kdeApps_stable.kdelibs;
}; }
in kde4 // { ../desktops/kde-4.14;
inherit kde4;
wrapper = callPackage ../build-support/kdewrapper {};
recurseForRelease = true;
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 { };
bangarang = callPackage ../applications/video/bangarang { }; bangarang = callPackage ../applications/video/bangarang { };
@ -12980,7 +12976,7 @@ let
dconf = gnome3.dconf; dconf = gnome3.dconf;
}; };
quasselWithoutKDE = (self.quassel.override { quasselWithoutKDE = (quassel.override {
monolithic = true; monolithic = true;
daemon = false; daemon = false;
client = false; client = false;
@ -12989,7 +12985,7 @@ let
tag = "-without-kde"; tag = "-without-kde";
}); });
quasselDaemon = (self.quassel.override { quasselDaemon = (quassel.override {
monolithic = false; monolithic = false;
daemon = true; daemon = true;
client = false; client = false;
@ -12998,14 +12994,14 @@ let
tag = "-daemon"; tag = "-daemon";
}); });
quasselClient = (self.quassel.override { quasselClient = (quassel.override {
monolithic = false; monolithic = false;
daemon = false; daemon = false;
client = true; client = true;
tag = "-client"; tag = "-client";
}); });
quasselClientWithoutKDE = (self.quasselClient.override { quasselClientWithoutKDE = (quasselClient.override {
monolithic = false; monolithic = false;
daemon = false; daemon = false;
client = true; client = true;
@ -13033,6 +13029,24 @@ let
kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
}; };
callPackageOrig = newScope (extra // { cmake = cmake-3_2; });
makePackages = extra:
let
callPackage = newScope (extra // { cmake = cmake-3_2; } // 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;
pantheon = recurseIntoAttrs rec { pantheon = recurseIntoAttrs rec {
callPackage = newScope pkgs.pantheon; callPackage = newScope pkgs.pantheon;
pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };