diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
| commit | 3e31d23d994b94b9883a39037e328c026491b999 (patch) | |
| tree | aa5fec3413ae5b31a32ce37423ed677206121883 /pkgs/applications/graphics/freecad/default.nix | |
| parent | 0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4 (diff) | |
| parent | 2c07921cff84dfb0b9e0f6c2d10ee2bfee6a85ac (diff) | |
| download | nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.gz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.bz2 nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.lz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.xz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.zst nixlib-3e31d23d994b94b9883a39037e328c026491b999.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/applications/graphics/freecad/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8001080a170a..6362d6c06fe9 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran, fetchpatch +, hdf5, vtk, medfile, zlib, python27Packages, swig, gfortran, fetchpatch , soqt, libf2c, makeWrapper, makeDesktopItem , mpi ? null }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; }; - buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts + buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile ] ++ (with pythonPackages; [ matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost |