alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #57879 from timor/fix-freecad-build-19.03

Browse source 
Fix FreeCAD build 19.03
This commit is contained in:
Robert Schütz 2019-03-24 19:34:07 +01:00 committed by GitHub
parent af27dbf1d1 de1634a36e
commit 5bf6a13417
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/python-modules/pivy/default.nix
View file

@ -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
];

6
pkgs/development/python-modules/pyside/tools.nix
View file

@ -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";