From 17369ceae93d98cc85e18f3a88283842fea47c67 Mon Sep 17 00:00:00 2001 From: timor Date: Mon, 18 Mar 2019 20:59:34 +0100 Subject: [PATCH 1/3] pythonPackages.pivy: fix build --- pkgs/development/python-modules/pivy/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 4619400b6e3..37c999e86b4 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -16,8 +16,13 @@ buildPythonPackage rec { sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; }; + nativeBuildInputs = with pkgs; [ + swig1 coin3d soqt + ]; + buildInputs = with pkgs; with xorg; [ - swig1 coin3d soqt libGLU_combined + coin3d soqt + libGLU_combined libXi libXext libSM libICE libX11 ]; From 6b8f80053f39871d7301d0db0eba13fc58e48a82 Mon Sep 17 00:00:00 2001 From: timor Date: Mon, 18 Mar 2019 21:16:41 +0100 Subject: [PATCH 2/3] pythonPackages.pysideTools: fix build --- pkgs/development/python-modules/pyside/tools.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index abb0bdebd5d..a0bd73dd61e 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -13,7 +13,9 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake pyside qt4 pysideShiboken ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ pyside qt4 pysideShiboken ]; meta = { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; From de1634a36ee56313cde20d94742703dfb351474d Mon Sep 17 00:00:00 2001 From: timor Date: Sun, 24 Mar 2019 17:41:30 +0100 Subject: [PATCH 3/3] pythonPackages.pysideTools: add python deps to propagatedBuildInputs --- pkgs/development/python-modules/pyside/tools.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index a0bd73dd61e..e23e6352518 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -15,7 +15,9 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ pyside qt4 pysideShiboken ]; + buildInputs = [ qt4 ]; + + propagatedBuildInputs = [ pyside pysideShiboken ]; meta = { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";