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

python37: Remove references to openssl.dev #51775

Closed
wants to merge 1 commit into from

Conversation

andrew-d
Copy link
Contributor

@andrew-d andrew-d commented Dec 9, 2018

Motivation for this change

Updates the postInstall to also strip the configure flag that contains --with-openssl=/nix/store/..., which results in a reference to openssl.dev
Fixes #51465

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 nox --run "nox-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.

cc @FRidh

@@ -145,7 +145,11 @@ in stdenv.mkDerivation {
# some $TMPDIR references to improve binary reproducibility.
# Note that the .pyc file of _sysconfigdata.py should be regenerated!
for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do
sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
sed -i $i \
-e "s|-I/nix/store/[^ ']*||g" \
Copy link
Contributor

Choose a reason for hiding this comment

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

I know this is an existing problem, but we shouldn't assume that the Nix store is at /nix/store.

Copy link
Member

Choose a reason for hiding this comment

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

NIX_BUILD_TOP is the best thing to use instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did some digging, and it looks like nuke-references uses $NIX_STORE; I updated the PR to use that instead!

@rasendubi
Copy link
Member

(triage) anything blocking this from being merged?

@dezgeg is your comment resolved?

@dotlambda
Copy link
Member

conflicts with #51724

@FRidh
Copy link
Member

FRidh commented Dec 26, 2018

Thanks. Pushed 2526f9f to staging.

@FRidh FRidh closed this Dec 26, 2018
@andrew-d andrew-d deleted the andrew/python-closure-size branch December 28, 2018 20:06
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

7 participants