Commit 10d94780 authored by K900's avatar K900
Browse files

qt6: build with Apple SDK 12.3 

This is still multiple versions behind where we should be,
but it is the latest we've got (for now, anyway), and 11.0
doesn't build at all.
parent 38fb2331

pkgs/development/libraries/qt-6/default.nix

+9 −9
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ let 
        inherit srcs python3;

        stdenv =

          if stdenv.hostPlatform.isDarwin

          then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; }

          then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "12.3"; }

          else stdenv;

      });

    in
@@ -42,7 +42,7 @@ let 
      qtbase = callPackage ./modules/qtbase.nix {

        withGtk3 = !stdenv.hostPlatform.isMinGW;

        inherit (srcs.qtbase) src version;

        inherit (darwin.apple_sdk_11_0.frameworks)

        inherit (darwin.apple_sdk_12_3.frameworks)

          AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit;

        patches = [

          ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch
@@ -113,7 +113,7 @@ let 
      qt5compat = callPackage ./modules/qt5compat.nix { };

      qtcharts = callPackage ./modules/qtcharts.nix { };

      qtconnectivity = callPackage ./modules/qtconnectivity.nix {

        inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth PCSC;

        inherit (darwin.apple_sdk_12_3.frameworks) IOBluetooth PCSC;

      };

      qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };

      qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
@@ -127,7 +127,7 @@ let 
      qtlottie = callPackage ./modules/qtlottie.nix { };

      qtmultimedia = callPackage ./modules/qtmultimedia.nix {

        inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;

        inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox;

        inherit (darwin.apple_sdk_12_3.frameworks) VideoToolbox;

      };

      qtmqtt = callPackage ./modules/qtmqtt.nix { };

      qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
@@ -137,7 +137,7 @@ let 
      qtserialport = callPackage ./modules/qtserialport.nix { };

      qtshadertools = callPackage ./modules/qtshadertools.nix { };

      qtspeech = callPackage ./modules/qtspeech.nix {

        inherit (darwin.apple_sdk_11_0.frameworks) Cocoa;

        inherit (darwin.apple_sdk_12_3.frameworks) Cocoa;

      };

      qtquick3d = callPackage ./modules/qtquick3d.nix { };

      qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { };
@@ -153,9 +153,9 @@ let 
      qtwebchannel = callPackage ./modules/qtwebchannel.nix { };

      qtwebengine = callPackage ./modules/qtwebengine.nix {

        inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu;

        inherit (darwin.apple_sdk_11_0) libpm libunwind;

        inherit (darwin.apple_sdk_11_0.libs) sandbox;

        inherit (darwin.apple_sdk_11_0.frameworks)

        inherit (darwin.apple_sdk_12_3) libpm libunwind;

        inherit (darwin.apple_sdk_12_3.libs) sandbox;

        inherit (darwin.apple_sdk_12_3.frameworks)

          AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback

          GameController ImageCaptureCore LocalAuthentication

          MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz
@@ -174,7 +174,7 @@ let 
      };

      qtwebsockets = callPackage ./modules/qtwebsockets.nix { };

      qtwebview = callPackage ./modules/qtwebview.nix {

        inherit (darwin.apple_sdk_11_0.frameworks) WebKit;

        inherit (darwin.apple_sdk_12_3.frameworks) WebKit;

      };



      wrapQtAppsHook = callPackage