diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-05 12:15:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-05 12:15:51 +0100 |
| commit | 17491905e6112b602b4a905f99cf2e0f88abd58b (patch) | |
| tree | d3c38eb09043d023837d48ac2fb27c99d105d5ce /pkgs/top-level | |
| parent | a86a90f4a0a3f21ab7f533955b8f361b79ec2ec8 (diff) | |
| parent | 44b66a31f8533bf55797ba080a42f3a91e17e959 (diff) | |
Merge pull request #202015 from wegank/qt6-qtbase-darwin
qt6: add darwin support
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f66128c5d7b52..4b721e3997ba8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22203,11 +22203,11 @@ with pkgs; qt6 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-6) { inherit newScope; - inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; + inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; inherit bison cups dconf harfbuzz libGL perl gtk3 ninja; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; - inherit buildPackages; - inherit libglvnd; + inherit darwin buildPackages libglvnd; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; cmake = cmake.overrideAttrs (attrs: { patches = attrs.patches ++ [ ../development/libraries/qt-6/patches/cmake.patch |