Skip to content

Commit 057f63b

Browse files
authored
[Backport release-24.11] python312Packages.pyside6: fix eval on linux (NixOS#356438)
2 parents f45667d + d796aff commit 057f63b

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

pkgs/development/python-modules/pyside6/default.nix

+12-13
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,18 @@ stdenv.mkDerivation (finalAttrs: {
9494
pythonImportsCheckHook
9595
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
9696

97-
buildInputs =
98-
python.pkgs.qt6.darwinVersionInputs
99-
++ (
100-
if stdenv.hostPlatform.isLinux then
101-
# qtwebengine fails under darwin
102-
# see https://github.com/NixOS/nixpkgs/pull/312987
103-
packages ++ [ python.pkgs.qt6.qtwebengine ]
104-
else
105-
[
106-
qt_linked
107-
cups
108-
]
109-
);
97+
buildInputs = (
98+
if stdenv.hostPlatform.isLinux then
99+
# qtwebengine fails under darwin
100+
# see https://github.com/NixOS/nixpkgs/pull/312987
101+
packages ++ [ python.pkgs.qt6.qtwebengine ]
102+
else
103+
python.pkgs.qt6.darwinVersionInputs
104+
++ [
105+
qt_linked
106+
cups
107+
]
108+
);
110109

111110
propagatedBuildInputs = [ shiboken6 ];
112111

pkgs/development/python-modules/shiboken6/default.nix

+12-9
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,18 @@ stdenv'.mkDerivation (finalAttrs: {
3131
(python.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ]))
3232
] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
3333

34-
buildInputs = [
35-
llvmPackages.llvm
36-
llvmPackages.libclang
37-
python.pkgs.qt6.qtbase
38-
python.pkgs.qt6.darwinVersionInputs
39-
python.pkgs.ninja
40-
python.pkgs.packaging
41-
python.pkgs.setuptools
42-
];
34+
buildInputs =
35+
[
36+
llvmPackages.llvm
37+
llvmPackages.libclang
38+
python.pkgs.qt6.qtbase
39+
python.pkgs.ninja
40+
python.pkgs.packaging
41+
python.pkgs.setuptools
42+
]
43+
++ lib.optionals stdenv.hostPlatform.isDarwin [
44+
python.pkgs.qt6.darwinVersionInputs
45+
];
4346

4447
cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
4548

0 commit comments

Comments
 (0)