diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index fb5a46fbc63e..7495dfffd710 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -12,13 +12,15 @@ # make a copy of this directory first. After copying, be sure to delete ./tmp # 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; +let kf5Orig = kf5; in + let - kf5 = kf55.override { inherit debug; }; + kf5 = kf5Orig.override { inherit debug; }; 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: fold (f: x: f x) super [ + (qt5Only "kmix") (userEnvPkg "SharedMimeInfo") (userEnvPkg "SharedDesktopOntologies") (blacklist ["artikulate"]) # build failure, wrong boost? diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix index ec4a2beb4d01..e7d85cc5085e 100644 --- a/pkgs/build-support/autonix/default.nix +++ b/pkgs/build-support/autonix/default.nix @@ -162,6 +162,7 @@ in inherit generateCollection; inherit isDepAttr; inherit manifest; + inherit removePkgDeps; inherit resolveDeps; inherit userEnvPkg; inherit writeManifestXML; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3a0876605ba..aa55535ad1d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10434,6 +10434,7 @@ let }; kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { + kf5 = kf55; stdenv = overrideGCC stdenv gccStdInc; }); kdeApps_latest = kdeApps_14_12;