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

Merge pull request #67732 from lightbulbjim/freecad-wayland

Browse Source 
freecad: fix missing app icon and name when running under Wayland
This commit is contained in:
worldofpeace 2019-09-02 01:17:20 -04:00 committed by GitHub
commit 2baa9e74c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { stdenv, mkDerivation, fetchurl, fetchpatch, cmake, ninja, coin3d, xercesc, ode
, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu , eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile
, soqt, libf2c, libGLU, makeWrapper, pkgconfig , zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU
, mpi ? null }: , makeWrapper, pkgconfig, mpi ? null }:
assert mpi != null; assert mpi != null;
@ -19,13 +19,20 @@ in mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ]; nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];
buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts 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 libGLU libXmu qtbase qttools qtwebkit
] ++ (with qt5; [ ] ++ (with pythonPackages; [
qtbase qttools qtwebkit
]) ++ (with pythonPackages; [
matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost 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 = [ cmakeFlags = [
"-DBUILD_QT5=ON" "-DBUILD_QT5=ON"
"-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"