diff options
| author | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2020-09-07 10:53:37 -0500 |
|---|---|---|
| committer | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2020-09-07 10:53:37 -0500 |
| commit | e865c6ffccb80452f6353bb4bd0695c3199374cb (patch) | |
| tree | f7b2ec223ae6b73adb35f16ac61aa06dd4a20093 | |
| parent | 0368d93a9e978b90ba844d83b292178e3a8c7574 (diff) | |
| download | nixpkgs-e865c6ffccb80452f6353bb4bd0695c3199374cb.tar nixpkgs-e865c6ffccb80452f6353bb4bd0695c3199374cb.tar.gz nixpkgs-e865c6ffccb80452f6353bb4bd0695c3199374cb.tar.bz2 nixpkgs-e865c6ffccb80452f6353bb4bd0695c3199374cb.tar.lz nixpkgs-e865c6ffccb80452f6353bb4bd0695c3199374cb.tar.xz nixpkgs-e865c6ffccb80452f6353bb4bd0695c3199374cb.tar.zst nixpkgs-e865c6ffccb80452f6353bb4bd0695c3199374cb.zip | |
pivy: pin to qt514
| -rw-r--r-- | pkgs/development/python-modules/pivy/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 36427f99585..de75a7d390c 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake }: buildPythonPackage rec { pname = "pivy"; @@ -12,20 +12,20 @@ buildPythonPackage rec { }; nativeBuildInputs = with pkgs; [ - swig qt5.qmake cmake + swig qmake cmake ]; buildInputs = with pkgs; with xorg; [ - coin3d soqt qt5.qtbase + coin3d soqt qtbase libGLU libGL libXi libXext libSM libICE libX11 ]; NIX_CFLAGS_COMPILE = toString [ - "-I${pkgs.qt5.qtbase.dev}/include/QtCore" - "-I${pkgs.qt5.qtbase.dev}/include/QtGui" - "-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL" - "-I${pkgs.qt5.qtbase.dev}/include/QtWidgets" + "-I${qtbase.dev}/include/QtCore" + "-I${qtbase.dev}/include/QtGui" + "-I${qtbase.dev}/include/QtOpenGL" + "-I${qtbase.dev}/include/QtWidgets" ]; dontUseQmakeConfigure = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7c614b9f70..67d96f10d74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4417,7 +4417,9 @@ in { 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; }; |