git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #57879 from timor/fix-freecad-build-19.03

Fix FreeCAD build 19.03

commit5bf6a1341764490f72b1849faac849b5d5fa021c authorRobert Schütz <rschuetz17@gmail.com> dateSun 24 Mar 2019, 19:34 (8 years ago) parentaf27dbfde1634a
2 files changed+11−2
pkgs/development/python-modules/pivy/default.nix+6−1 pkgs/development/python-modules/pyside/tools.nix+5−1
pkgs/development/python-modules/pivy/default.nix+6−1
@@ -16,8 +16,13 @@ buildPythonPackage rec {
1616 sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf";
1717 };
1818
19+ nativeBuildInputs = with pkgs; [
20+ swig1 coin3d soqt
21+ ];
22+
1923 buildInputs = with pkgs; with xorg; [
20− swig1 coin3d soqt libGLU_combined
24+ coin3d soqt
25+ libGLU_combined
2126 libXi libXext libSM libICE libX11
2227 ];
2328
pkgs/development/python-modules/pyside/tools.nix+5−1
@@ -13,7 +13,11 @@ buildPythonPackage rec {
1313
1414 enableParallelBuilding = true;
1515
16− buildInputs = [ cmake pyside qt4 pysideShiboken ];
16+ nativeBuildInputs = [ cmake ];
17+
18+ buildInputs = [ qt4 ];
19+
20+ propagatedBuildInputs = [ pyside pysideShiboken ];
1721
1822 meta = {
1923 description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";