Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qt6: expose darwinVersionInputs; python312Packages.{shiboken6,pyside6}: use qt6.darwinVersionInputs #354599

Merged
merged 3 commits into from
Nov 10, 2024
Merged

qt6: expose darwinVersionInputs; python312Packages.{shiboken6,pyside6}: use qt6.darwinVersionInputs #354599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51190ab
qt6: expose `darwinVersionInputs`
emilazy Nov 8, 2024
88895fc
python312Packages.shiboken6: use `qt6.darwinVersionInputs`
emilazy Nov 8, 2024
8606038
python312Packages.pyside6: use `qt6.darwinVersionInputs`
emilazy Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ let
in
{

inherit callPackage srcs;
inherit callPackage srcs darwinVersionInputs;

qtModule = callPackage ./qtModule.nix {
inherit darwinVersionInputs;
Expand Down
35 changes: 12 additions & 23 deletions pkgs/development/python-modules/pyside6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
shiboken6,
llvmPackages,
symlinkJoin,
libGL,
darwin,
}:
let
packages = with python.pkgs.qt6; [
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ];

Expand Down
1 change: 1 addition & 0 deletions pkgs/development/python-modules/shiboken6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down