diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2019-08-09 13:39:10 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2019-08-09 13:39:23 +0200 |
| commit | 439ce61c51ee57e292376ffb06db9877e67a31d8 (patch) | |
| tree | 0d278d7bbe3a4d521417982b936ca9c94ebd5f2c /pkgs/applications/graphics/freecad | |
| parent | 6446e7e7ace0974fed29f44beec5da3852775523 (diff) | |
| download | nixpkgs-439ce61c51ee57e292376ffb06db9877e67a31d8.tar nixpkgs-439ce61c51ee57e292376ffb06db9877e67a31d8.tar.gz nixpkgs-439ce61c51ee57e292376ffb06db9877e67a31d8.tar.bz2 nixpkgs-439ce61c51ee57e292376ffb06db9877e67a31d8.tar.lz nixpkgs-439ce61c51ee57e292376ffb06db9877e67a31d8.tar.xz nixpkgs-439ce61c51ee57e292376ffb06db9877e67a31d8.tar.zst nixpkgs-439ce61c51ee57e292376ffb06db9877e67a31d8.zip | |
freecad: use qt wrapper
Diffstat (limited to 'pkgs/applications/graphics/freecad')
| -rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8f0fe00a85e..b8f4d544503 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts +{ 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 }: @@ -7,7 +7,7 @@ assert mpi != null; let pythonPackages = python3Packages; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "freecad-${version}"; version = "0.18.3"; @@ -46,22 +46,23 @@ in stdenv.mkDerivation rec { # Their main() removes PYTHONPATH=, and we rely on it. preConfigure = '' sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp - ''; - postInstall = '' - wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ - --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; + qtWrapperArgs = [ + "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" + ]; + postFixup = '' mv $out/share/doc $out ''; meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - homepage = https://www.freecadweb.org/; + homepage = "https://www.freecadweb.org/"; license = licenses.lgpl2Plus; - maintainers = [ maintainers.viric ]; + maintainers = with maintainers; [ viric gebner ]; platforms = platforms.linux; }; } |