BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

freecad: fix missing app icon and name when running under Wayland

Browse source 
Has been upstreamed and should be safe to remove in versions >= 0.19
This commit is contained in:
Chris Rendle-Short 2019-08-28 21:44:08 +10:00
parent bc08b42da4
commit 58cba198a4
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/applications/graphics/freecad/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, mkDerivation, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts
, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu
, soqt, libf2c, libGLU, makeWrapper, pkgconfig
, mpi ? null }:
{ stdenv, mkDerivation, fetchurl, 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 }:
assert mpi != null;
@ -19,13 +19,20 @@ in mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];
buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts
zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
libGLU libXmu
] ++ (with qt5; [
qtbase qttools qtwebkit
]) ++ (with pythonPackages; [
libGLU libXmu qtbase qttools qtwebkit
] ++ (with pythonPackages; [
matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
]);
# Fix missing app icon on Wayland. Has been upstreamed and should be safe to
# remove in versions >= 0.19
patches = [
(fetchpatch {
url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch";
sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h";
})
];
cmakeFlags = [
"-DBUILD_QT5=ON"
"-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"