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

qt5: use overrideSDK instead of callPackages

Browse Source
This commit is contained in:
Randy Eckenrode 2023-10-27 20:51:23 -04:00
parent b6a14a3a84
commit f16202fa88
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View File

@ -24667,7 +24667,7 @@ with pkgs;
darwin buildPackages;
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
inherit config;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
});
libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix {

7
pkgs/top-level/qt5-packages.nix
View File

@ -178,7 +178,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
qca-qt5 = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/qca-qt5 {
qca-qt5 = callPackage ../development/libraries/qca-qt5 {
stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv;
inherit (libsForQt5) qtbase;
};
@ -209,8 +210,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
qtinstaller = callPackage ../development/libraries/qtinstaller { };
qtkeychain = callPackage ../development/libraries/qtkeychain {
stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreFoundation Security;
stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
};
qtmpris = callPackage ../development/libraries/qtmpris { };