cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #168524 from willcohen/qt-5.14-darwin

Browse source 
qt5, libsForQt5: 5.12 -> 5.14 on darwin
This commit is contained in:
Thomas Tuegel 2022-04-14 09:25:35 -05:00 committed by GitHub
commit e516ffb990
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/libraries/qt-5/5.14/default.nix
View file

@ -194,6 +194,7 @@ let
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
qtscript = callPackage ../modules/qtscript.nix {};
qtsensors = callPackage ../modules/qtsensors.nix {};
qtserialbus = callPackage ../modules/qtserialbus.nix {};
qtserialport = callPackage ../modules/qtserialport.nix {};
qtspeech = callPackage ../modules/qtspeech.nix {};
qtsvg = callPackage ../modules/qtsvg.nix {};

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

@ -19847,9 +19847,9 @@ with pkgs;
qt5 = qt515;
});
# TODO bump to 5.14 on darwin once it's not broken; see #95199
qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt515;
libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515;
# TODO bump to 5.15 on darwin once it's not broken; see #125548
qt5 = if stdenv.hostPlatform.isDarwin then qt514 else qt515;
libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt514 else libsForQt515;
# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
plasma5Packages = libsForQt515;