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

envision: autopatchelf after build #337340

Closed
wants to merge 162 commits into from

Conversation

Pandapip1
Copy link
Contributor

@Pandapip1 Pandapip1 commented Aug 25, 2024

Description of changes

Adds an OpenXR document to establish an expectation (and a little bit of responsibility), and updates envision to align with that new document. This is necessary because otherwise all OpenXR applications would need to run in a fhsenv with a list of commonly-used provider dependencies.

Also makes envision align with said document.

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.

@github-actions github-actions bot added the 8.has: documentation This PR adds or changes documentation label Aug 25, 2024
@Pandapip1 Pandapip1 added 0.kind: bug Something is broken 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes labels Aug 25, 2024
@Pandapip1 Pandapip1 force-pushed the envision-autopatchelf branch 2 times, most recently from 9b31ff5 to fb0690a Compare August 25, 2024 21:20
@ofborg ofborg bot requested review from svanderburg and Scrumplex August 25, 2024 22:53
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4485

@Aleksanaa
Copy link
Member

There's autoPatchelfHook, not sure if that (unmaintained) tool would be helpful

@Pandapip1
Copy link
Contributor Author

I'm aware autopatchelfHook exists, but it doesn't actually expose the autopatchelf binary.

@Artturin
Copy link
Member

Artturin commented Sep 6, 2024

I'm aware autopatchelfHook exists, but it doesn't actually expose the autopatchelf binary.

Maybe expose it in the passthru of autoPatchelfHook if its maintainers are ok with that.

The old autopatchelf needs to be clearly labelled as old-autopatchelf to make sure no one uses it. (preferably it's not added to nixpkgs)

@Pandapip1
Copy link
Contributor Author

The old autopatchelf needs to be clearly labelled as old-autopatchelf to make sure no one uses it. (preferably it's not added to nixpkgs)

Out of curiosity, why shouldn't it be used?

@Artturin
Copy link
Member

Artturin commented Sep 6, 2024

The old autopatchelf needs to be clearly labelled as old-autopatchelf to make sure no one uses it. (preferably it's not added to nixpkgs)

Out of curiosity, why shouldn't it be used?

It's likely lacking all the fixes the in-tree auto-patchelf.sh had before being rewritten in python and the fixes the python version has

@Scrumplex
Copy link
Member

Maybe expose it in the passthru of autoPatchelfHook if its maintainers are ok with that.

I have proposed #340162 for this ^^

@ElvishJerricco
Copy link
Contributor

@Pandapip1

I'm aware autopatchelfHook exists, but it doesn't actually expose the autopatchelf binary.

Because it doesn't use it. That binary is obsolete and what we use now is in-tree.

@Pandapip1
Copy link
Contributor Author

Yeah, @Scrumplex already told me that. I'm reviewing their PR to expose it.

@Pandapip1 Pandapip1 marked this pull request as draft October 16, 2024 18:02
@Pandapip1
Copy link
Contributor Author

Tracking @Scrumplex's exposing of auto-patchelf: https://nixpk.gs/pr-tracker.html?pr=340162

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 1, 2024
@Pandapip1 Pandapip1 force-pushed the envision-autopatchelf branch from fb0690a to 221895e Compare November 6, 2024 22:15
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 7, 2024
@Pandapip1 Pandapip1 force-pushed the envision-autopatchelf branch from 221895e to 6f6005c Compare November 7, 2024 02:03
@Pandapip1 Pandapip1 changed the base branch from master to staging-next November 7, 2024 02:03
@Pandapip1 Pandapip1 force-pushed the envision-autopatchelf branch from 28d1874 to 8af5d9e Compare November 25, 2024 23:38
@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: ocaml 6.topic: vscode 6.topic: lib The Nixpkgs function library 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: dotnet Language: .NET 6.topic: flutter labels Nov 25, 2024
@Pandapip1 Pandapip1 closed this Nov 25, 2024
@nix-owners
Copy link

nix-owners bot commented Nov 25, 2024

The PR's base branch is set to staging-next, but 159 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the master branch, change the base branch to master
  • If the changes should go to the staging-next branch, rebase your PR onto the merge base with the staging-next branch:
    # git rebase --onto $(git merge-base upstream/staging-next HEAD) $(git merge-base upstream/master HEAD)
    git rebase --onto 504e3ecdd9553f0cd5af3305bb7d30d766fbada1 b718c275a9860ac3da020a181c3fc3e9b87d530c
    git push --force-with-lease

@Pandapip1
Copy link
Contributor Author

Sorry all; realized my mistake right as I hit enter on the force push.

@Pandapip1 Pandapip1 deleted the envision-autopatchelf branch November 25, 2024 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: bug Something is broken 6.topic: dotnet Language: .NET 6.topic: flutter 6.topic: lib The Nixpkgs function library 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ocaml 6.topic: python 6.topic: vscode 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 11.by: package-maintainer This PR was created by the maintainer of the package it changes backport staging-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.