diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 73 |
1 files changed, 16 insertions, 57 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 119228b751b..09663010dee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1431,7 +1431,7 @@ with pkgs; q = callPackage ../tools/networking/q {}; - qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; + qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { }; quich = callPackage ../tools/misc/quich { } ; @@ -3734,7 +3734,7 @@ with pkgs; traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; - calamares = libsForQt515.callPackage ../tools/misc/calamares { + calamares = libsForQt5.callPackage ../tools/misc/calamares { python = python3; boost = boost.override { enablePython = true; python = python3; }; }; @@ -12066,7 +12066,7 @@ with pkgs; ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; teip = callPackage ../tools/text/teip { }; @@ -17784,7 +17784,7 @@ with pkgs; rizin = pkgs.callPackage ../development/tools/analysis/rizin { }; - cutter = libsForQt515.callPackage ../development/tools/analysis/rizin/cutter.nix { }; + cutter = libsForQt5.callPackage ../development/tools/analysis/rizin/cutter.nix { }; ragel = ragelStable; @@ -22124,33 +22124,7 @@ with pkgs; developerBuild = true; }; - qt512 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.12) { - inherit newScope; - inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison cups dconf harfbuzz libGL perl gtk3 python2; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit darwin; - inherit buildPackages; - stdenv = if stdenv.cc.isGNU - then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) - else stdenv; - }); - - qt514 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.14) { - inherit newScope; - inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison cups dconf harfbuzz libGL perl gtk3 python2; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit darwin; - inherit buildPackages; - stdenv = if stdenv.cc.isGNU - then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) - else stdenv; - }); - - qt515 = recurseIntoAttrs (makeOverridable + qt5 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; @@ -22160,24 +22134,10 @@ with pkgs; inherit buildPackages; }); - libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib pkgs; - qt5 = qt512; - }); - - libsForQt514 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib pkgs; - qt5 = qt514; + libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { + inherit lib pkgs qt5; }); - libsForQt515 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib pkgs; - qt5 = qt515; - }); - - qt5 = qt515; - libsForQt5 = libsForQt515; - # TODO: remove once no package needs this anymore or together with OpenSSL 1.1 qt5_openssl_1_1 = qt5.overrideScope' (_: super: { qtbase = super.qtbase.override { @@ -22194,7 +22154,7 @@ with pkgs; }; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop - plasma5Packages = libsForQt515; + plasma5Packages = libsForQt5; qtEnv = qt5.env; qt5Full = qt5.full; @@ -23053,7 +23013,7 @@ with pkgs; vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; - vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { + vtk_8 = libsForQt5.callPackage ../development/libraries/vtk/8.x.nix { stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; @@ -23064,7 +23024,7 @@ with pkgs; vtk_8_withQt5 = vtk_8.override { enableQt = true; }; - vtk_9 = libsForQt515.callPackage ../development/libraries/vtk/9.x.nix { + vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -27592,7 +27552,7 @@ with pkgs; milkytracker = callPackage ../applications/audio/milkytracker { }; - ptcollab = libsForQt515.callPackage ../applications/audio/ptcollab { }; + ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; schismtracker = callPackage ../applications/audio/schismtracker { }; @@ -27979,7 +27939,7 @@ with pkgs; ffmpeg = ffmpeg-full; }; - cpeditor = libsForQt515.callPackage ../applications/editors/cpeditor { }; + cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; csa = callPackage ../applications/audio/csa { }; @@ -29930,8 +29890,7 @@ with pkgs; kooha = callPackage ../applications/video/kooha { }; - # Qt 5.15 is not default on mac, tdesktop requires 5.15 (and kotatogram subsequently) - kotatogram-desktop = libsForQt515.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { + kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo @@ -30083,7 +30042,7 @@ with pkgs; kupfer = callPackage ../applications/misc/kupfer { }; - kvirc = libsForQt515.callPackage ../applications/networking/irc/kvirc { }; + kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; lame = callPackage ../development/libraries/lame { }; @@ -31891,7 +31850,7 @@ with pkgs; scantailor = callPackage ../applications/graphics/scantailor { }; - scantailor-advanced = libsForQt515.callPackage ../applications/graphics/scantailor/advanced.nix { }; + scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; sc-im = callPackage ../applications/misc/sc-im { }; @@ -32072,7 +32031,7 @@ with pkgs; insync = callPackage ../applications/networking/insync { }; - insync-v3 = libsForQt515.callPackage ../applications/networking/insync/v3.nix { }; + insync-v3 = libsForQt5.callPackage ../applications/networking/insync/v3.nix { }; libstrangle = callPackage ../tools/X11/libstrangle { stdenv = stdenv_32bit; |