public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89522 from josephtheengineer/freecad-wrapQtAppsHook

Browse Source 
freecad: use wrapQtAppsHook
This commit is contained in:
Gabriel Ebner 2020-06-05 10:07:00 +02:00 committed by GitHub
commit ae2bdf2c1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/graphics/freecad/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode { stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook,
, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
, makeWrapper, pkgconfig, mpi ? null }: gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }:
assert mpi != null; assert mpi != null;
@ -18,8 +18,16 @@ in mkDerivation rec {
sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s";
}; };
nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ]; nativeBuildInputs = [
buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts 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 zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
libGLU libXmu qtbase qttools qtwebkit libGLU libXmu qtbase qttools qtwebkit
] ++ (with pythonPackages; [ ] ++ (with pythonPackages; [