From 2060d3945cb2922aae89cde628e2327532cfafb3 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 30 Sep 2025 07:40:47 +0800 Subject: [PATCH] python3Packages.pivy: remove unused buildInputs --- .../python-modules/pivy/default.nix | 55 +++++++------------ pkgs/top-level/python-packages.nix | 1 - 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 0e66042a1d85..ef81f8d92b13 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -3,10 +3,11 @@ buildPythonPackage, fetchFromGitHub, setuptools, - pkgs, - qtbase, - qmake, + swig, + cmake, + coin3d, soqt, + libGLU, }: buildPythonPackage rec { @@ -21,54 +22,36 @@ buildPythonPackage rec { hash = "sha256-DRA4NTAHg2iB/D1CU9pJEpsZwX9GW3X5gpxbIwP54Ko="; }; + # https://github.com/coin3d/pivy/pull/138 + # FindThreads only works if either C or CXX language is enabled + postPatch = '' + substituteInPlace distutils_cmake/CMakeLists.txt \ + --replace-fail 'project(pivy_cmake_setup NONE)' 'project(pivy_cmake_setup CXX)' + ''; + build-system = [ setuptools ]; dontUseCmakeConfigure = true; - nativeBuildInputs = with pkgs; [ + nativeBuildInputs = [ swig - qmake cmake ]; - buildInputs = - with pkgs; - with xorg; - [ - coin3d - soqt - qtbase - libGLU - libGL - libXi - libXext - libSM - libICE - libX11 - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-I${qtbase.dev}/include/QtCore" - "-I${qtbase.dev}/include/QtGui" - "-I${qtbase.dev}/include/QtOpenGL" - "-I${qtbase.dev}/include/QtWidgets" + buildInputs = [ + coin3d + soqt + libGLU # dummy buildInput that provides missing header ]; - dontUseQmakeConfigure = true; dontWrapQtApps = true; - doCheck = false; - - postPatch = '' - substituteInPlace distutils_cmake/CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \ - \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}' - ''; pythonImportsCheck = [ "pivy" ]; - meta = with lib; { + meta = { homepage = "https://github.com/coin3d/pivy/"; description = "Python binding for Coin"; - license = licenses.bsd0; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 868443a35ce2..58d4be23fc88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11849,7 +11849,6 @@ self: super: with self; { piqp = callPackage ../development/python-modules/piqp { }; pivy = callPackage ../development/python-modules/pivy { - inherit (pkgs.qt5) qtbase qmake; inherit (pkgs.libsForQt5) soqt; };