From 1c7067dfbd5ab0de92bc81f13e98d000ba19df6b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 23 Jan 2023 23:56:22 +0100 Subject: [PATCH] qt6Packages: migrate to apple_sdk_11_0 --- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/qt6-packages.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d7229e7d07..bb64903686c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22639,6 +22639,7 @@ with pkgs; qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { inherit lib pkgs qt6; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); quark-engine = callPackage ../tools/security/quark-engine { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index e566a8af758..9d6a58cb3b5 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -7,6 +7,7 @@ { lib , pkgs , qt6 +, stdenv }: (lib.makeScope pkgs.newScope ( self: @@ -24,6 +25,8 @@ let in (qt6 // { + inherit stdenv; + # LIBRARIES inherit (kdeFrameworks) kcoreaddons;