diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-05 16:15:01 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-05 16:15:01 +0100 |
| commit | a2c1eff83c3118a9aee8076c7f84f58137416b6e (patch) | |
| tree | 4668c9ad2bba229a0eb3ccc8adbe78402e04ab07 /nixpkgs/pkgs/applications/graphics/freecad/default.nix | |
| parent | fa7e5142244bb8fd1c51b66df6e623a7f41cc0d3 (diff) | |
| parent | 85f1ba3e51676fa8cc604a3d863d729026a6b8eb (diff) | |
| download | nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.gz nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.bz2 nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.lz nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.xz nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.zst nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/freecad/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/graphics/freecad/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix index f997f23d43cf..76b2a38320d8 100644 --- a/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -108,6 +108,10 @@ stdenv.mkDerivation (finalAttrs: { qtx11extras ]; + patches = [ + ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch + ]; + cmakeFlags = [ "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on "-DBUILD_FLAT_MESH:BOOL=ON" @@ -127,10 +131,7 @@ stdenv.mkDerivation (finalAttrs: { export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; ''; - # Their main() removes PYTHONPATH=, and we rely on it. preConfigure = '' - sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; |