git.iko.soy/typeable/nixpkgs
on master help sign in
freecad: fix missing app icon and name when running under Wayland

Has been upstreamed and should be safe to remove in versions >= 0.19

commit58cba198a4bdc798c785fb1c10b4634ffb61cbe1 authorChris Rendle-Short <chris@killred.net> dateWed 28 Aug 2019, 21:44 (7 years ago) parentbc08b42
1 file changed+15−8
pkgs/applications/graphics/freecad/default.nix+15−8
pkgs/applications/graphics/freecad/default.nix+15−8
@@ -1,7 +1,7 @@
1−{ stdenv, mkDerivation, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts
2−, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu
3−, soqt, libf2c, libGLU, makeWrapper, pkgconfig
4−, mpi ? null }:
1+{ stdenv, mkDerivation, fetchurl, fetchpatch, cmake, ninja, coin3d, xercesc, ode
2+, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile
3+, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU
4+, makeWrapper, pkgconfig, mpi ? null }:
55
66assert mpi != null;
77
@@ -19,13 +19,20 @@ in mkDerivation rec {
1919 nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];
2020 buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts
2121 zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
22− libGLU libXmu
23− ] ++ (with qt5; [
24− qtbase qttools qtwebkit
25− ]) ++ (with pythonPackages; [
22+ libGLU libXmu qtbase qttools qtwebkit
23+ ] ++ (with pythonPackages; [
2624 matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
2725 ]);
2826
27+ # Fix missing app icon on Wayland. Has been upstreamed and should be safe to
28+ # remove in versions >= 0.19
29+ patches = [
30+ (fetchpatch {
31+ url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch";
32+ sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h";
33+ })
34+ ];
35+
2936 cmakeFlags = [
3037 "-DBUILD_QT5=ON"
3138 "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"