vscode-js-debug: fix missing jq in postPatch #320877
Merged
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
Fixes NixOS#320507. The `npmConfigHook` used by `buildNpmPackage` does not correctly propagate the `nativeBuildInputs` into its `PATH`, which is why `jq` was not available during the patch phase. Since this `npmConfigHook` is run as part of a fixed-output derivation (`fetchNpmDeps`), if it had already been realised, unless its hash had changed, a missing `jq` would not be noticed, on a rebuild of `vscode-js-debug`. The `postPatch` hook is *also* run during `buildNpmPackage`, but there the `nativeBuildInputs` were correctly added to the `PATH`, which is why a rebuild of `vscode-js-debug` with the previous `postPatch` would succeed (if its `npmDeps`'s hash hadn't changed).
This was referenced Jun 18, 2024
superherointj
approved these changes
Jun 18, 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.
Fixes #320507.
The
npmConfigHookused bybuildNpmPackagedoes not correctly propagate thenativeBuildInputsinto itsPATH, which is whyjqwas not available during the patch phase.Since this
npmConfigHookis run as part of a fixed-output derivation (fetchNpmDeps), if it had already been realised, unless its hash had changed, a missingjqwould not be noticed, on a rebuild ofvscode-js-debug.The
postPatchhook is also run duringbuildNpmPackage, but there thenativeBuildInputswere correctly added to thePATH, which is why a rebuild ofvscode-js-debugwith the previouspostPatchwould succeed (if itsnpmDeps's hash hadn't changed).Description of changes
Hard-coded a reference to
jqusing an absolute path intopostPatch. Specifically,buildPackages.jq, which is equivalent tonativeBuildInputsfrom a cross-compilation perspective.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/)