kdeApps.kmix: remove Qt 4 dependencies

This commit is contained in:
Thomas Tuegel 2015-02-01 10:25:19 -06:00
parent 9e7afd50fb
commit 2b933f31f6
3 changed files with 11 additions and 2 deletions

View File

@ -12,13 +12,15 @@
# make a copy of this directory first. After copying, be sure to delete ./tmp # make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions. # if it exists. Then follow the minor update instructions.
{ autonix, kde4, kf55, pkgs, qt4, stdenv, debug ? false }: { autonix, kde4, kf5, pkgs, qt4, stdenv, debug ? false }:
with stdenv.lib; with autonix; with stdenv.lib; with autonix;
let kf5Orig = kf5; in
let let
kf5 = kf55.override { inherit debug; }; kf5 = kf5Orig.override { inherit debug; };
mirror = "mirror://kde"; mirror = "mirror://kde";
@ -114,9 +116,14 @@ let
} }
); );
qt5Only = tgt:
let qt4Deps = [ "KDE4" "Phonon" ];
in mapAttrs (name: if name == tgt then removePkgDeps qt4Deps else id);
preResolve = super: preResolve = super:
fold (f: x: f x) super fold (f: x: f x) super
[ [
(qt5Only "kmix")
(userEnvPkg "SharedMimeInfo") (userEnvPkg "SharedMimeInfo")
(userEnvPkg "SharedDesktopOntologies") (userEnvPkg "SharedDesktopOntologies")
(blacklist ["artikulate"]) # build failure, wrong boost? (blacklist ["artikulate"]) # build failure, wrong boost?

View File

@ -162,6 +162,7 @@ in
inherit generateCollection; inherit generateCollection;
inherit isDepAttr; inherit isDepAttr;
inherit manifest; inherit manifest;
inherit removePkgDeps;
inherit resolveDeps; inherit resolveDeps;
inherit userEnvPkg; inherit userEnvPkg;
inherit writeManifestXML; inherit writeManifestXML;

View File

@ -10434,6 +10434,7 @@ let
}; };
kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
kf5 = kf55;
stdenv = overrideGCC stdenv gccStdInc; stdenv = overrideGCC stdenv gccStdInc;
}); });
kdeApps_latest = kdeApps_14_12; kdeApps_latest = kdeApps_14_12;