diff options
| author | josephtheengineer <joseph@theengineer.life> | 2020-06-05 14:16:52 +1000 |
|---|---|---|
| committer | josephtheengineer <joseph@theengineer.life> | 2020-06-05 14:16:52 +1000 |
| commit | 4eaa5a086344a435edbd6e2ee698c55605b039e6 (patch) | |
| tree | 8dc7155703bfc5b6a58b41af9ed25fb15f8a62d6 /pkgs/applications | |
| parent | 42f7db63ff04042ee5c603f998cf6d2acdb2eb4c (diff) | |
| download | nixlib-4eaa5a086344a435edbd6e2ee698c55605b039e6.tar nixlib-4eaa5a086344a435edbd6e2ee698c55605b039e6.tar.gz nixlib-4eaa5a086344a435edbd6e2ee698c55605b039e6.tar.bz2 nixlib-4eaa5a086344a435edbd6e2ee698c55605b039e6.tar.lz nixlib-4eaa5a086344a435edbd6e2ee698c55605b039e6.tar.xz nixlib-4eaa5a086344a435edbd6e2ee698c55605b039e6.tar.zst nixlib-4eaa5a086344a435edbd6e2ee698c55605b039e6.zip | |
freecad: use wrapQtAppsHook
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index eb087c42ce0e..657caeca8b3d 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,7 +1,7 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode -, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile -, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU -, makeWrapper, pkgconfig, mpi ? null }: +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, +xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, +opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, +gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: assert mpi != null; @@ -18,8 +18,16 @@ in mkDerivation rec { sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; }; - nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ]; - buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts + nativeBuildInputs = [ + cmake + ninja + pkgconfig + pythonPackages.pyside2-tools + wrapQtAppsHook + ]; + + buildInputs = [ + cmake coin3d xercesc ode eigen opencascade-occt gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile libGLU libXmu qtbase qttools qtwebkit ] ++ (with pythonPackages; [ |