mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 02:13:23 +00:00
Merge branch 'kde4-override'
This commit is contained in:
Thomas Tuegel
commit
60c123560e
@ -12851,187 +12851,201 @@ let
|
||||
|
||||
kde4 = recurseIntoAttrs pkgs.kde414;
|
||||
|
||||
kde414 = kdePackagesFor (pkgs.kde414 // {
|
||||
libusb = libusb1;
|
||||
libcanberra = libcanberra_kde;
|
||||
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;
|
||||
kde414 =
|
||||
kdePackagesFor
|
||||
{
|
||||
libusb = libusb1;
|
||||
libcanberra = libcanberra_kde;
|
||||
boost = boost156;
|
||||
kdelibs = kdeApps_stable.kdelibs;
|
||||
};
|
||||
in kde4 // {
|
||||
inherit kde4;
|
||||
}
|
||||
../desktops/kde-4.14;
|
||||
|
||||
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 { };
|
||||
basket = callPackage ../applications/office/basket { };
|
||||
|
||||
basket = callPackage ../applications/office/basket { };
|
||||
bluedevil = callPackage ../tools/bluetooth/bluedevil { };
|
||||
|
||||
bluedevil = callPackage ../tools/bluetooth/bluedevil { };
|
||||
calligra = callPackage ../applications/office/calligra { eigen = eigen2; };
|
||||
|
||||
calligra = callPackage ../applications/office/calligra { eigen = eigen2; };
|
||||
choqok = callPackage ../applications/networking/instant-messengers/choqok { };
|
||||
|
||||
choqok = callPackage ../applications/networking/instant-messengers/choqok { };
|
||||
colord-kde = callPackage ../tools/misc/colord-kde { };
|
||||
|
||||
colord-kde = callPackage ../tools/misc/colord-kde { };
|
||||
digikam = if builtins.compareVersions "4.9" kde4.release == 1 then
|
||||
callPackage ../applications/graphics/digikam/2.nix { }
|
||||
else
|
||||
callPackage ../applications/graphics/digikam { };
|
||||
|
||||
digikam = if builtins.compareVersions "4.9" kde4.release == 1 then
|
||||
callPackage ../applications/graphics/digikam/2.nix { }
|
||||
else
|
||||
callPackage ../applications/graphics/digikam { };
|
||||
eventlist = callPackage ../applications/office/eventlist {};
|
||||
|
||||
eventlist = callPackage ../applications/office/eventlist {};
|
||||
k3b = callPackage ../applications/misc/k3b {
|
||||
cdrtools = cdrkit;
|
||||
};
|
||||
|
||||
k3b = callPackage ../applications/misc/k3b {
|
||||
cdrtools = cdrkit;
|
||||
};
|
||||
kadu = callPackage ../applications/networking/instant-messengers/kadu { };
|
||||
|
||||
kadu = callPackage ../applications/networking/instant-messengers/kadu { };
|
||||
kbibtex = callPackage ../applications/office/kbibtex { };
|
||||
|
||||
kbibtex = callPackage ../applications/office/kbibtex { };
|
||||
kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { };
|
||||
|
||||
kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { };
|
||||
kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
|
||||
|
||||
kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
|
||||
kdeconnect = callPackage ../applications/misc/kdeconnect { };
|
||||
|
||||
kdeconnect = callPackage ../applications/misc/kdeconnect { };
|
||||
kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
|
||||
|
||||
kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
|
||||
kdesvn = callPackage ../applications/version-management/kdesvn { };
|
||||
|
||||
kdesvn = callPackage ../applications/version-management/kdesvn { };
|
||||
kdevelop = callPackage ../applications/editors/kdevelop { };
|
||||
|
||||
kdevelop = callPackage ../applications/editors/kdevelop { };
|
||||
kdevplatform = callPackage ../development/libraries/kdevplatform {
|
||||
boost = boost156;
|
||||
};
|
||||
|
||||
kdevplatform = callPackage ../development/libraries/kdevplatform {
|
||||
boost = boost156;
|
||||
};
|
||||
kdiff3 = callPackage ../tools/text/kdiff3 { };
|
||||
|
||||
kdiff3 = callPackage ../tools/text/kdiff3 { };
|
||||
kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
|
||||
|
||||
kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
|
||||
kile = callPackage ../applications/editors/kile { };
|
||||
|
||||
kile = callPackage ../applications/editors/kile { };
|
||||
kmplayer = callPackage ../applications/video/kmplayer { };
|
||||
|
||||
kmplayer = callPackage ../applications/video/kmplayer { };
|
||||
kmymoney = callPackage ../applications/office/kmymoney { };
|
||||
|
||||
kmymoney = callPackage ../applications/office/kmymoney { };
|
||||
kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
|
||||
|
||||
kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
|
||||
konversation = callPackage ../applications/networking/irc/konversation { };
|
||||
|
||||
konversation = callPackage ../applications/networking/irc/konversation { };
|
||||
kvirc = callPackage ../applications/networking/irc/kvirc { };
|
||||
|
||||
kvirc = callPackage ../applications/networking/irc/kvirc { };
|
||||
krename = callPackage ../applications/misc/krename { };
|
||||
|
||||
krename = callPackage ../applications/misc/krename { };
|
||||
krusader = callPackage ../applications/misc/krusader { };
|
||||
|
||||
krusader = callPackage ../applications/misc/krusader { };
|
||||
ksshaskpass = callPackage ../tools/security/ksshaskpass {};
|
||||
|
||||
ksshaskpass = callPackage ../tools/security/ksshaskpass {};
|
||||
ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
|
||||
|
||||
ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
|
||||
kuickshow = callPackage ../applications/graphics/kuickshow { };
|
||||
|
||||
kuickshow = callPackage ../applications/graphics/kuickshow { };
|
||||
libalkimia = callPackage ../development/libraries/libalkimia { };
|
||||
|
||||
libalkimia = callPackage ../development/libraries/libalkimia { };
|
||||
libktorrent = callPackage ../development/libraries/libktorrent {
|
||||
boost = boost156;
|
||||
};
|
||||
|
||||
libktorrent = callPackage ../development/libraries/libktorrent {
|
||||
boost = boost156;
|
||||
};
|
||||
libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
|
||||
|
||||
libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
|
||||
liblikeback = callPackage ../development/libraries/liblikeback { };
|
||||
|
||||
liblikeback = callPackage ../development/libraries/liblikeback { };
|
||||
libmm-qt = callPackage ../development/libraries/libmm-qt { };
|
||||
|
||||
libmm-qt = callPackage ../development/libraries/libmm-qt { };
|
||||
libnm-qt = callPackage ../development/libraries/libnm-qt { };
|
||||
|
||||
libnm-qt = callPackage ../development/libraries/libnm-qt { };
|
||||
massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
|
||||
|
||||
massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
|
||||
networkmanagement = callPackage ../tools/networking/networkmanagement { };
|
||||
|
||||
networkmanagement = callPackage ../tools/networking/networkmanagement { };
|
||||
partitionManager = callPackage ../tools/misc/partition-manager { };
|
||||
|
||||
partitionManager = callPackage ../tools/misc/partition-manager { };
|
||||
plasma-nm = callPackage ../tools/networking/plasma-nm { };
|
||||
|
||||
plasma-nm = callPackage ../tools/networking/plasma-nm { };
|
||||
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 { };
|
||||
|
||||
psi = callPackage ../applications/networking/instant-messengers/psi { };
|
||||
qtcurve = callPackage ../misc/themes/qtcurve { };
|
||||
|
||||
qtcurve = callPackage ../misc/themes/qtcurve { };
|
||||
quassel = callPackage ../applications/networking/irc/quassel rec {
|
||||
monolithic = true;
|
||||
daemon = false;
|
||||
client = false;
|
||||
withKDE = stdenv.isLinux;
|
||||
qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0)
|
||||
dconf = gnome3.dconf;
|
||||
};
|
||||
|
||||
quassel = callPackage ../applications/networking/irc/quassel rec {
|
||||
monolithic = true;
|
||||
daemon = false;
|
||||
client = false;
|
||||
withKDE = stdenv.isLinux;
|
||||
qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0)
|
||||
dconf = gnome3.dconf;
|
||||
};
|
||||
quasselWithoutKDE = (quassel.override {
|
||||
monolithic = true;
|
||||
daemon = false;
|
||||
client = false;
|
||||
withKDE = false;
|
||||
#qt = qt5;
|
||||
tag = "-without-kde";
|
||||
});
|
||||
|
||||
quasselWithoutKDE = (self.quassel.override {
|
||||
monolithic = true;
|
||||
daemon = false;
|
||||
client = false;
|
||||
withKDE = false;
|
||||
#qt = qt5;
|
||||
tag = "-without-kde";
|
||||
});
|
||||
quasselDaemon = (quassel.override {
|
||||
monolithic = false;
|
||||
daemon = true;
|
||||
client = false;
|
||||
withKDE = false;
|
||||
#qt = qt5;
|
||||
tag = "-daemon";
|
||||
});
|
||||
|
||||
quasselDaemon = (self.quassel.override {
|
||||
monolithic = false;
|
||||
daemon = true;
|
||||
client = false;
|
||||
withKDE = false;
|
||||
#qt = qt5;
|
||||
tag = "-daemon";
|
||||
});
|
||||
quasselClient = (quassel.override {
|
||||
monolithic = false;
|
||||
daemon = false;
|
||||
client = true;
|
||||
tag = "-client";
|
||||
});
|
||||
|
||||
quasselClient = (self.quassel.override {
|
||||
monolithic = false;
|
||||
daemon = false;
|
||||
client = true;
|
||||
tag = "-client";
|
||||
});
|
||||
quasselClientWithoutKDE = (quasselClient.override {
|
||||
monolithic = false;
|
||||
daemon = false;
|
||||
client = true;
|
||||
withKDE = false;
|
||||
#qt = qt5;
|
||||
tag = "-client-without-kde";
|
||||
});
|
||||
|
||||
quasselClientWithoutKDE = (self.quasselClient.override {
|
||||
monolithic = false;
|
||||
daemon = false;
|
||||
client = true;
|
||||
withKDE = false;
|
||||
#qt = qt5;
|
||||
tag = "-client-without-kde";
|
||||
});
|
||||
rekonq = callPackage ../applications/networking/browsers/rekonq { };
|
||||
|
||||
rekonq = callPackage ../applications/networking/browsers/rekonq { };
|
||||
kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
|
||||
|
||||
kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
|
||||
rsibreak = callPackage ../applications/misc/rsibreak { };
|
||||
|
||||
rsibreak = callPackage ../applications/misc/rsibreak { };
|
||||
semnotes = callPackage ../applications/misc/semnotes { };
|
||||
|
||||
semnotes = callPackage ../applications/misc/semnotes { };
|
||||
skrooge = callPackage ../applications/office/skrooge { };
|
||||
|
||||
skrooge = callPackage ../applications/office/skrooge { };
|
||||
telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
|
||||
|
||||
telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
|
||||
yakuake = callPackage ../applications/misc/yakuake { };
|
||||
|
||||
yakuake = callPackage ../applications/misc/yakuake { };
|
||||
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 // { 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 {
|
||||
callPackage = newScope pkgs.pantheon;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user