gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: move things that build and run with Qt 5.15 to Qt 5.15

Browse Source
This commit is contained in:
K900
2022-11-27 19:56:00 +01:00
committed by Rick van Schijndel
parent 1be86c6823
commit 0ca0937e42
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+7 -8
View File
@@ -608,8 +608,7 @@ with pkgs;
archiver = callPackage ../applications/misc/archiver { };
# It segfaults if it uses qt5.15
digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox {
digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox {
autoreconfHook = buildPackages.autoreconfHook269;
};
@@ -2290,7 +2289,7 @@ with pkgs;
brakeman = callPackage ../development/tools/analysis/brakeman { };
brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ;
brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
# Derivation's result is not used by nixpkgs. Useful for validation for
# regressions of bootstrapTools on hydra and on ofborg. Example:
@@ -11083,7 +11082,7 @@ with pkgs;
rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { };
rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { };
rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { };
rowhammer-test = callPackage ../tools/system/rowhammer-test { };
@@ -12975,7 +12974,7 @@ with pkgs;
wireguard-go = callPackage ../tools/networking/wireguard-go { };
wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { };
wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { };
wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin {
libjpeg8 = libjpeg.override { enableJpeg8 = true; };
@@ -27710,7 +27709,7 @@ with pkgs;
cava = callPackage ../applications/audio/cava { };
cb2bib = libsForQt514.callPackage ../applications/office/cb2bib { };
cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
cbatticon = callPackage ../applications/misc/cbatticon { };
@@ -29681,7 +29680,7 @@ with pkgs;
lua = lua5_1;
};
ipe = libsForQt514.callPackage ../applications/graphics/ipe {
ipe = libsForQt5.callPackage ../applications/graphics/ipe {
ghostscript = ghostscriptX;
texlive = texlive.combine { inherit (texlive) scheme-small; };
lua5 = lua5_3;
@@ -36357,7 +36356,7 @@ with pkgs;
### SCIENCE/ROBOTICS
apmplanner2 = libsForQt514.callPackage ../applications/science/robotics/apmplanner2 { };
apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { };