libpsl: make python both a build and runtime dependency #321150
+3
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kirillrdy
reviewed
Jun 20, 2024
| @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { | |||
| "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" | |||
| "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" | |||
| "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" | |||
| "PYTHON=${lib.getDev buildPackages.python3}/bin/python3" | |||
There was a problem hiding this comment.
Why getDev, dev output usually doesn't have bin
There was a problem hiding this comment.
Oh dear, now THAT is a typo. I have no idea how this worked in my testing...
kirillrdy
reviewed
Jun 20, 2024
| @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { | |||
| "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" | |||
| "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" | |||
| "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" | |||
| "PYTHON=${lib.getBin buildPackages.python3}/bin/python3" | |||
There was a problem hiding this comment.
Suggested change
| "PYTHON=${lib.getBin buildPackages.python3}/bin/python3" | |
| "PYTHON=${lib.getExe buildPackages.python3}" |
|
Description seems backwards? Also do we still need the one runnable at build time for cross? |
|
You're right, the description is backwards. I'll fix it in a moment. I recall attempting to switch python to just being a buildInput, but it failed, and I was in fact testing linux -> freebsd cross while working on this. |
Previously, python3 was only provided as a nativeBuildInput. However, libpsl.bin distributes python scripts. To make them use the right python, provide python as a buildInput and specify which python to use at build time with a configure flag.
Ericson2314
approved these changes
Jul 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Previously, python3 was only provided as a buildInput. However, libpsl.bin distributes python scripts. To make them use the right python, provide python as a nativeBuildInput and specify which python to use for the build with a configure flag.
This rebuilds curl.dev. I'm not sure how far-reaching the consequences of that are, but it at least includes rebuilding rustc, so I'm targeting staging.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.