From 51190abf6296e61da41a11204212c5c893e52462 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Nov 2024 21:22:11 +0000 Subject: [PATCH 1/3] qt6: expose `darwinVersionInputs` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a little gross as it’s not a very good name and should really be considered an internal API, but PySide wants it. --- pkgs/development/libraries/qt-6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 88895fc2bf8c086a46b734aeb72ab9cc3872b541 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Nov 2024 21:22:11 +0000 Subject: [PATCH 2/3] python312Packages.shiboken6: use `qt6.darwinVersionInputs` --- pkgs/development/python-modules/shiboken6/default.nix | 1 + 1 file changed, 1 insertion(+) 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 From 8606038195fe13b1d47dfe43edf4d0ef78c86f97 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Nov 2024 21:22:11 +0000 Subject: [PATCH 3/3] python312Packages.pyside6: use `qt6.darwinVersionInputs` --- .../python-modules/pyside6/default.nix | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) 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 ];