diff options
author | Gabriel Ebner <gebner@gebner.org> | 2019-08-09 15:29:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-09 15:29:52 +0200 |
commit | 6be96fbd4a7297685ae20dbd4dc5724e107afa90 (patch) | |
tree | e5b80498360d1f0cfcd206dfff02883e811d9ff0 | |
parent | 38e77b1f6c013e39233e4701f80a6eaafd051f6c (diff) | |
parent | 439ce61c51ee57e292376ffb06db9877e67a31d8 (diff) | |
download | nixlib-6be96fbd4a7297685ae20dbd4dc5724e107afa90.tar nixlib-6be96fbd4a7297685ae20dbd4dc5724e107afa90.tar.gz nixlib-6be96fbd4a7297685ae20dbd4dc5724e107afa90.tar.bz2 nixlib-6be96fbd4a7297685ae20dbd4dc5724e107afa90.tar.lz nixlib-6be96fbd4a7297685ae20dbd4dc5724e107afa90.tar.xz nixlib-6be96fbd4a7297685ae20dbd4dc5724e107afa90.tar.zst nixlib-6be96fbd4a7297685ae20dbd4dc5724e107afa90.zip |
Merge pull request #66379 from gebner/freecadwrapqt
freecad: use qt wrapper
-rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8f0fe00a85e4..b8f4d5445036 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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e9eb55dbab7..88b585a7bade 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18344,7 +18344,7 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; }; + freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; freemind = callPackage ../applications/misc/freemind { }; |