-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
Fix FreeCAD build 19.03 #57879
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix FreeCAD build 19.03 #57879
Conversation
Fixes should typically go to master first, and then cherry-picked (with |
That certainly was my intention. Is something missing? |
@@ -16,8 +16,12 @@ buildPythonPackage rec { | |||
sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; | |||
}; | |||
|
|||
nativeBuildInputs = with pkgs; [ | |||
swig1 coin3d soqt |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're sure these should only be native? Did you actually try using pivy?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, not sure. I tested compilation and running FreeCAD. I don't know how to test, from within FreeCAD, that the coin3d library is called correctly. Should I add it to buildInputs
too, to be on the safe side?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My intuition is that both, coin3d and soqt, don't belong into nativeBuildInputs
but buildInputs
. If that works, I guess we can leave it as is.
However, we should eventually bring pivy up to date and maybe try running the tests as in https://github.com/FreeCAD/pivy/blob/0.6.4/.travis.yml#L20.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, they were there, until b4acd97 specifically set strictDeps
to true, but states that compile/runtime deps belong to buildInputs
. These two things seem to be opposed to each other, though, since this has the effect of CFLAGS
not
including the buildInputs
dependencies anymore. Equally probable that I misunderstood the whole thing, though.
TLDR: no idea, really.
Note that there is another WIP PR (see description) which deals with bringing pivy and everything else up-to-date.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Afaik, swig
is only used at build time whereas the other two are runtime dependencies. Hence coin3d
and soqt
should definitely be in buildInputs
. After looking at this further I think it is required to also put them in nativeBuildInputs
because coin-config
soqt-config
are called at build time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
f07d878
to
6202e00
Compare
@GrahamcOfBorg build python2.pkgs.pivy python3.pkgs.pivy python2.pkgs.pyside-tools python3.pkgs.pyside-tools |
@GrahamcOfBorg build python2.pkgs.pivy python2.pkgs.pysideTools python3.pkgs.pysideTools |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please correct the commit messages: the attribute is pythonPackages.pysideTools
.
6202e00
to
de1634a
Compare
Right, thanks! Changed the messages. |
@GrahamcOfBorg build python2.pkgs.pivy python2.pkgs.pysideTools python3.pkgs.pysideTools |
@timor Thanks a lot! |
Motivation for this change
Some dependencies of FreeCAD have not been building since a recent change to
buildPythonPackage
. This fixes the python modules necessary for FreeCAD, which should help with#56826
This PR is only intended to fix the build for 19.03. There is another PRs which additionally updates a bunch of dependencies (#57121), that should be pulled in in the long run.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)