diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index a4aa9124c3b9..0fcae043a793 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -50,7 +50,7 @@ let in { - inherit callPackage srcs; + inherit callPackage srcs darwinVersionInputs; qtModule = callPackage ./qtModule.nix { inherit darwinVersionInputs; diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 652e84d9a366..840af05e4bab 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -11,8 +11,6 @@ shiboken6, llvmPackages, symlinkJoin, - libGL, - darwin, }: let packages = with python.pkgs.qt6; [ @@ -70,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: { # cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. # We therefore symLink all required and optional Qt modules in one directory tree ("qt_linked"). - # Also we remove "Designer" from darwin build, due to linking failure postPatch = '' # Don't ignore optional Qt modules @@ -98,26 +95,18 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; buildInputs = - if stdenv.hostPlatform.isLinux then - # qtwebengine fails under darwin - # see https://github.com/NixOS/nixpkgs/pull/312987 - packages ++ [ python.pkgs.qt6.qtwebengine ] - else - with darwin.apple_sdk_11_0.frameworks; - [ - qt_linked - libGL - cups - # frameworks - IOKit - DiskArbitration - CoreBluetooth - EventKit - AVFoundation - Contacts - AGL - AppKit - ]; + python.pkgs.qt6.darwinVersionInputs + ++ ( + if stdenv.hostPlatform.isLinux then + # qtwebengine fails under darwin + # see https://github.com/NixOS/nixpkgs/pull/312987 + packages ++ [ python.pkgs.qt6.qtwebengine ] + else + [ + qt_linked + cups + ] + ); propagatedBuildInputs = [ shiboken6 ]; diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index 911f68900789..e5889977ed13 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -35,6 +35,7 @@ stdenv'.mkDerivation (finalAttrs: { llvmPackages.llvm llvmPackages.libclang python.pkgs.qt6.qtbase + python.pkgs.qt6.darwinVersionInputs python.pkgs.ninja python.pkgs.packaging python.pkgs.setuptools