public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pivy: pin to qt514

Browse Source
This commit is contained in:
Thomas Tuegel 2020-09-07 10:53:37 -05:00
parent 0368d93a9e
commit e865c6ffcc
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/pivy/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs }: { stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pivy"; pname = "pivy";
@ -12,20 +12,20 @@ buildPythonPackage rec {
}; };
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
swig qt5.qmake cmake swig qmake cmake
]; ];
buildInputs = with pkgs; with xorg; [ buildInputs = with pkgs; with xorg; [
coin3d soqt qt5.qtbase coin3d soqt qtbase
libGLU libGL libGLU libGL
libXi libXext libSM libICE libX11 libXi libXext libSM libICE libX11
]; ];
NIX_CFLAGS_COMPILE = toString [ NIX_CFLAGS_COMPILE = toString [
"-I${pkgs.qt5.qtbase.dev}/include/QtCore" "-I${qtbase.dev}/include/QtCore"
"-I${pkgs.qt5.qtbase.dev}/include/QtGui" "-I${qtbase.dev}/include/QtGui"
"-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL" "-I${qtbase.dev}/include/QtOpenGL"
"-I${pkgs.qt5.qtbase.dev}/include/QtWidgets" "-I${qtbase.dev}/include/QtWidgets"
]; ];
dontUseQmakeConfigure = true; dontUseQmakeConfigure = true;

4
pkgs/top-level/python-packages.nix
View File

@ -4417,7 +4417,9 @@ in {
pipx = callPackage ../development/python-modules/pipx { }; pipx = callPackage ../development/python-modules/pipx { };
pivy = callPackage ../development/python-modules/pivy { }; pivy = callPackage ../development/python-modules/pivy {
inherit (qt5) qtbase qmake;
};
pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; };