[Backport release-24.11] python312Packages.pyside6: fix eval on linux (…

…NixOS#356438)
motiejus · Nov 16, 2024 · 057f63b · 057f63b
2 parents f45667d + d796aff
commit 057f63b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
@@ -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 ];
 

diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
@@ -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" ];