mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
[Backport release-24.11] python312Packages.pyside6: fix eval on linux (#356438)
This commit is contained in:
commit
057f63b6dc
@ -94,19 +94,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pythonImportsCheckHook
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
|
||||
|
||||
buildInputs =
|
||||
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
|
||||
]
|
||||
);
|
||||
buildInputs = (
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
# qtwebengine fails under darwin
|
||||
# see https://github.com/NixOS/nixpkgs/pull/312987
|
||||
packages ++ [ python.pkgs.qt6.qtwebengine ]
|
||||
else
|
||||
python.pkgs.qt6.darwinVersionInputs
|
||||
++ [
|
||||
qt_linked
|
||||
cups
|
||||
]
|
||||
);
|
||||
|
||||
propagatedBuildInputs = [ shiboken6 ];
|
||||
|
||||
|
@ -31,15 +31,18 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
(python.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ]))
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
llvmPackages.llvm
|
||||
llvmPackages.libclang
|
||||
python.pkgs.qt6.qtbase
|
||||
python.pkgs.qt6.darwinVersionInputs
|
||||
python.pkgs.ninja
|
||||
python.pkgs.packaging
|
||||
python.pkgs.setuptools
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
llvmPackages.llvm
|
||||
llvmPackages.libclang
|
||||
python.pkgs.qt6.qtbase
|
||||
python.pkgs.ninja
|
||||
python.pkgs.packaging
|
||||
python.pkgs.setuptools
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
python.pkgs.qt6.darwinVersionInputs
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user