Merge pull request #57879 from timor/fix-freecad-build-19.03
Fix FreeCAD build 19.03
This commit is contained in:
commit
5bf6a13417
@ -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
|
||||
];
|
||||
|
||||
|
@ -13,7 +13,11 @@ buildPythonPackage rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ cmake pyside qt4 pysideShiboken ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
|
||||
propagatedBuildInputs = [ pyside pysideShiboken ];
|
||||
|
||||
meta = {
|
||||
description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
|
||||
|
Loading…
Reference in New Issue
Block a user