Commit 2060d394 authored by qbisi's avatar qbisi
Browse files

python3Packages.pivy: remove unused buildInputs

parent 6d713db4

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

+19 −36
Original line number Diff line number Diff line
@@ -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;

    [

  buildInputs = [

    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"

    libGLU # dummy buildInput that provides missing header <GL/glu.h>

  ];



  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; [ ];

  };

}

pkgs/top-level/python-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -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;















  };