Skip to content
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

cura: 4.0.0 -> 4.1.0 #62374

Merged
merged 5 commits into from Jun 1, 2019
Merged

cura: 4.0.0 -> 4.1.0 #62374

merged 5 commits into from Jun 1, 2019

Conversation

gebner
Copy link
Member

@gebner gebner commented Jun 1, 2019

Motivation for this change

New cura version. cc maintainer @abbradar

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@gebner gebner requested a review from FRidh as a code owner June 1, 2019 09:22
@@ -20,8 +20,7 @@ buildPythonPackage rec {
buildInputs = [ protobuf ];

postPatch = ''
# To workaround buggy SIP detection which overrides PYTHONPATH
sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FRidh Do you know the proper way to get the python site-packages directory in cmake?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think there is a better way short of patching CMake's FindPython, and even that is questionable because it uses standard Python's sysconfig to get these paths and some packages may (rightfully) expect SITELIB to be Python's core site-packages. The root of the problem is that Python on FHS systems has only one true site-packages and everything expects that.

@gebner
Copy link
Member Author

gebner commented Jun 1, 2019

@GrahamcOfBorg eval
@GrahamcOfBorg build cura

@abbradar
Copy link
Member

abbradar commented Jun 1, 2019

Tested on Linux, builds and runs. Thanks!

@abbradar abbradar merged commit e07dba7 into NixOS:master Jun 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants