kdeApps.kmix: remove Qt 4 dependencies

+11 -2
+9 -2
pkgs/applications/kde-apps-14.12/default.nix
··· 12 12 # make a copy of this directory first. After copying, be sure to delete ./tmp 13 13 # if it exists. Then follow the minor update instructions. 14 14 15 - { autonix, kde4, kf55, pkgs, qt4, stdenv, debug ? false }: 15 + { autonix, kde4, kf5, pkgs, qt4, stdenv, debug ? false }: 16 16 17 17 with stdenv.lib; with autonix; 18 18 19 + let kf5Orig = kf5; in 20 + 19 21 let 20 22 21 - kf5 = kf55.override { inherit debug; }; 23 + kf5 = kf5Orig.override { inherit debug; }; 22 24 23 25 mirror = "mirror://kde"; 24 26 ··· 114 116 } 115 117 ); 116 118 119 + qt5Only = tgt: 120 + let qt4Deps = [ "KDE4" "Phonon" ]; 121 + in mapAttrs (name: if name == tgt then removePkgDeps qt4Deps else id); 122 + 117 123 preResolve = super: 118 124 fold (f: x: f x) super 119 125 [ 126 + (qt5Only "kmix") 120 127 (userEnvPkg "SharedMimeInfo") 121 128 (userEnvPkg "SharedDesktopOntologies") 122 129 (blacklist ["artikulate"]) # build failure, wrong boost?
+1
pkgs/build-support/autonix/default.nix
··· 162 162 inherit generateCollection; 163 163 inherit isDepAttr; 164 164 inherit manifest; 165 + inherit removePkgDeps; 165 166 inherit resolveDeps; 166 167 inherit userEnvPkg; 167 168 inherit writeManifestXML;
+1
pkgs/top-level/all-packages.nix
··· 10434 10434 }; 10435 10435 10436 10436 kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { 10437 + kf5 = kf55; 10437 10438 stdenv = overrideGCC stdenv gccStdInc; 10438 10439 }); 10439 10440 kdeApps_latest = kdeApps_14_12;