diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-10-27 20:51:23 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-11-01 09:06:44 -0400 |
| commit | f16202fa8870a4d326072d1112df584f2b6cd4a5 (patch) | |
| tree | c2292c05f55fbd714df87de15056b6daa1c9a413 | |
| parent | b6a14a3a848618f9016bd310eff2f7bcf44f1557 (diff) | |
| download | nixpkgs-f16202fa8870a4d326072d1112df584f2b6cd4a5.tar nixpkgs-f16202fa8870a4d326072d1112df584f2b6cd4a5.tar.gz nixpkgs-f16202fa8870a4d326072d1112df584f2b6cd4a5.tar.bz2 nixpkgs-f16202fa8870a4d326072d1112df584f2b6cd4a5.tar.lz nixpkgs-f16202fa8870a4d326072d1112df584f2b6cd4a5.tar.xz nixpkgs-f16202fa8870a4d326072d1112df584f2b6cd4a5.tar.zst nixpkgs-f16202fa8870a4d326072d1112df584f2b6cd4a5.zip | |
qt5: use overrideSDK instead of callPackages
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/qt5-packages.nix | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c55a0ea582a..84078e7478d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index ec2a1b1f719..2de212792e5 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -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 { }; |