diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db85ec622476..8ef231da4133 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7738,7 +7738,7 @@ with pkgs; ninka = callPackage ../development/tools/misc/ninka { }; - nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; + nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; nodenv = callPackage ../development/tools/nodenv { }; @@ -8681,7 +8681,7 @@ with pkgs; nmap-formatter = callPackage ../tools/security/nmap-formatter { }; - nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; + nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; @@ -12204,7 +12204,7 @@ with pkgs; colm = callPackage ../development/compilers/colm { }; - colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; + colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; @@ -27598,7 +27598,7 @@ with pkgs; libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; - librecad = libsForQt514.callPackage ../applications/misc/librecad { + librecad = libsForQt5.callPackage ../applications/misc/librecad { boost = boost175; }; @@ -27879,8 +27879,7 @@ with pkgs; meme-suite = callPackage ../applications/science/biology/meme-suite { }; - # Needs qtwebkit which is broken on qt5.15 - mendeley = libsForQt514.callPackage ../applications/office/mendeley { + mendeley = libsForQt5.callPackage ../applications/office/mendeley { gconf = gnome2.GConf; }; @@ -28988,7 +28987,7 @@ with pkgs; qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; - qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt { + qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt { gdal = gdal.override { libgeotiff = libgeotiff.override { proj = proj_7; }; libspatialite = libspatialite.override { proj = proj_7; }; @@ -30162,7 +30161,7 @@ with pkgs; virtual-ans = callPackage ../applications/audio/virtual-ans {}; - virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { + virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -30445,7 +30444,7 @@ with pkgs; worldengine-cli = python3Packages.worldengine; - wpsoffice = libsForQt514.callPackage ../applications/office/wpsoffice {}; + wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -34912,7 +34911,7 @@ with pkgs; inherit pkgs lib stdenv; }; - golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { };