b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

treewide: libsForQt5{12,14} -> libsForQt5

Browse source
This commit is contained in:
K900 2022-11-24 14:12:52 +03:00
parent dc2da375a2
commit 7d0516461c
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/top-level/all-packages.nix
View file

@ -3606,7 +3606,7 @@ with pkgs;
bookstack = callPackage ../servers/web-apps/bookstack { };
# Upstream recommends qt5.12 and it doesn't build with qt5.15
boomerang = libsForQt512.callPackage ../development/tools/boomerang { };
boomerang = libsForQt5.callPackage ../development/tools/boomerang { };
boost-build = callPackage ../development/tools/boost-build { };
@ -7147,7 +7147,7 @@ with pkgs;
fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {};
fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {};
fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix {};
footswitch = callPackage ../tools/inputmethods/footswitch { };
@ -10054,7 +10054,7 @@ with pkgs;
ola = callPackage ../applications/misc/ola { };
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor {
olive-editor = libsForQt5.callPackage ../applications/video/olive-editor {
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
@ -17556,7 +17556,7 @@ with pkgs;
minify = callPackage ../development/web/minify { };
minizinc = callPackage ../development/tools/minizinc { };
minizincide = qt514.callPackage ../development/tools/minizinc/ide.nix { };
minizincide = libsForQt5.callPackage ../development/tools/minizinc/ide.nix { };
mkcert = callPackage ../development/tools/misc/mkcert { };
@ -22080,7 +22080,7 @@ with pkgs;
python-qt = callPackage ../development/libraries/python-qt {
python = python27;
inherit (qt514) qmake qttools qtwebengine qtxmlpatterns;
inherit (qt5) qmake qttools qtwebengine qtxmlpatterns;
};
pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {};
@ -27402,7 +27402,7 @@ with pkgs;
masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };
foxitreader = libsForQt512.callPackage ../applications/misc/foxitreader { };
foxitreader = libsForQt5.callPackage ../applications/misc/foxitreader { };
pdfstudio2021 = callPackage ../applications/misc/pdfstudio {
year = "2021";
@ -27431,7 +27431,7 @@ with pkgs;
ahoviewer = callPackage ../applications/graphics/ahoviewer { };
airwave = callPackage ../applications/audio/airwave { qt5 = qt514; };
airwave = callPackage ../applications/audio/airwave { };
akira-unstable = callPackage ../applications/graphics/akira { };
@ -29888,7 +29888,7 @@ with pkgs;
kermit = callPackage ../tools/misc/kermit { };
kexi = libsForQt514.callPackage ../applications/office/kexi { };
kexi = libsForQt5.callPackage ../applications/office/kexi { };
khronos = callPackage ../applications/office/khronos { };
@ -31540,14 +31540,7 @@ with pkgs;
pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { };
pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview {
# use the same stdenv as libsForQt514 to fix build
boost = boost.override {
stdenv = if stdenv.cc.isGNU
then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv)
else stdenv;
};
};
pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
puredata = callPackage ../applications/audio/puredata { };
puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };
@ -31683,7 +31676,7 @@ with pkgs;
quisk = python38Packages.callPackage ../applications/radio/quisk { };
quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {};
quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {};
quodlibet = callPackage ../applications/audio/quodlibet {
inherit (gnome) adwaita-icon-theme;
@ -32273,7 +32266,7 @@ with pkgs;
swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
swift-im = libsForQt514.callPackage ../applications/networking/instant-messengers/swift-im {
swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im {
inherit (gnome2) GConf;
boost = boost168;
};
@ -32558,7 +32551,7 @@ with pkgs;
tonelib-metal = callPackage ../applications/audio/tonelib-metal { };
tony = libsForQt514.callPackage ../applications/audio/tony { };
tony = libsForQt5.callPackage ../applications/audio/tony { };
toot = callPackage ../applications/misc/toot { };