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.

Sign up for GitHub

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

Jump to bottom

vscode-extensions.ms-vscode.cpptools: Use the bundled interpreter for cpptools* #314009

Merged
merged 2 commits into from
May 25, 2024
Merged

vscode-extensions.ms-vscode.cpptools: Use the bundled interpreter for cpptools* #314009

merged 2 commits into from
May 25, 2024

Conversation

kjeremy
Copy link
Contributor

@kjeremy kjeremy commented May 23, 2024

Description of changes

Previously autoPatchelfHook would stomp on the interpreter for the bundled cpptools* executables. Here we manually run the hook and then explicitly patch the interpreter.

Fixes #311425

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

JohnRTitor
JohnRTitor requested changes May 23, 2024
View reviewed changes
Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

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

Check is failing, could you format the file with nixfmt-rfc-style?

@kjeremy
vscode-extensions.ms-vscode.cpptools: Use the bundled interpreter for…
5b63635 
… binaries

Previously autoPatchelfHook would stomp on the interpreter for the bundled
cpptools* executables. Here we manually run the hook and then explicitly
patch the interpreter.
@kjeremy
Copy link
Contributor Author

kjeremy commented May 23, 2024

Check is failing, could you format the file with nixfmt-rfc-style?

Done.

StarGate01
StarGate01 approved these changes May 23, 2024
View reviewed changes
Copy link
Member

@StarGate01 StarGate01 left a comment

Choose a reason for hiding this comment

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

LGTM, works in my installation of vscode. I am able to navigate C++ projects properly again.

@isabelroses isabelroses added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 23, 2024
@JohnRTitor
Copy link
Contributor

Result of nixpkgs-review pr 314009 run on x86_64-linux 1

1 package built:
  • vscode-extensions.ms-vscode.cpptools

JohnRTitor
JohnRTitor approved these changes May 23, 2024
View reviewed changes
Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

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

LGTM

@ofborg ofborg bot requested a review from StarGate01 May 23, 2024 16:31
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels May 23, 2024
@JohnRTitor JohnRTitor added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package backport release-24.05 Backport PR automatically and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels May 23, 2024
@superherointj superherointj merged commit 5c7f104 into NixOS:master May 25, 2024
31 checks passed
@github-actions github-actions bot mentioned this pull request May 25, 2024
Merged
1 task
@github-actions GitHub Actions
Copy link
Contributor

Successfully created backport PR for release-24.05:

@kjeremy kjeremy deleted the fix-cpptools branch May 25, 2024 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnRTitor JohnRTitor JohnRTitor approved these changes

@StarGate01 StarGate01 StarGate01 approved these changes

@jraygauthier jraygauthier Awaiting requested review from jraygauthier

@superherointj superherointj Awaiting requested review from superherointj

Assignees
No one assigned
Labels
6.topic: vscode 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package backport release-24.05 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ms-vscode.cpptools fails with Error: EROFS: read-only file system, chmod
5 participants
@kjeremy @JohnRTitor @StarGate01 @superherointj @isabelroses