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

freecad: fix PYTHONPATH patch header attribution

Browse Source 
In the course of updating this patch to apply cleanly I'd
accidentally erased evidence of Andreas Rammhold's earlier work.
Updating the patch header and formatting to amend this error.

Co-authored-by: Andreas Rammhold <andreas@rammhold.de>
This commit is contained in:
Samuel Rounce
2025-12-13 12:39:19 +00:00
co-authored by Andreas Rammhold
parent 1a27806b15
commit d7eb37f403
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch
+14 -15
View File
@@ -1,21 +1,20 @@
commit c534a831c2f7186ebabe4e17f1e1df6d11ebff89
Author: Samuel Rounce <me@samuelrounce.co.uk>
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu Sep 5 22:17:21 2024 +0100
Subject: [PATCH] NIXOS: don't ignore PYTHONPATH
[PATCH] NIXOS: don't ignore PYTHONPATH
On NixOS or rather within nixpkgs we provide the runtime Python
packages via the PYTHONPATH environment variable. FreeCAD tries its
best to ignore Python environment variables that are being inherited
from the environment. For Python versions >=3.11 it also tries to
initialize the interpreter config without any environmental data. We
have to initialize the configuration *with* the information from the
environment for our packaging to work.
Upstream has purposely isolated the environments AFAIK and thus
shouldn't accept this patch (as is). What they might accept (once
support for older Python versions has been dropped) is removing the
PYTHONPATH specific putenv calls.
On NixOS or rather within nixpkgs we provide the runtime Python
packages via the PYTHONPATH environment variable. FreeCAD tries its
best to ignore Python environment variables that are being inherited
from the environment. For Python versions >=3.11 it also tries to
initialize the interpreter config without any environmental data. We
have to initialize the configuration *with* the information from the
environment for our packaging to work.
Upstream has purposely isolated the environments AFAIK and thus
shouldn't accept this patch (as is). What they might accept (once
support for older Python versions has been dropped) is removing the
PYTHONPATH specific putenv calls.
---
src/Base/Interpreter.cpp | 1 +
src/Main/MainGui.cpp | 3 ---