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

nix: fix regression: asking for deprecated autoAddOpenGLRunpath #9220

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
nix: fix regression: asking for deprecated autoAddOpenGLRunpath
  • Loading branch information
SomeoneSerge committed Aug 28, 2024
commit 23d8f65ac008671580caf4e05872836fa704d814
6 changes: 2 additions & 4 deletions .devops/nix/package.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
lib,
autoAddDriverRunpath,
glibc,
config,
stdenv,
Expand Down Expand Up @@ -192,10 +193,7 @@ effectiveStdenv.mkDerivation (
]
++ optionals useCuda [
cudaPackages.cuda_nvcc

# TODO: Replace with autoAddDriverRunpath
# once https://github.com/NixOS/nixpkgs/pull/275241 has been merged
cudaPackages.autoAddOpenGLRunpathHook
autoAddDriverRunpath
]
++ optionals (effectiveStdenv.hostPlatform.isGnu && enableStatic) [
glibc.static
Expand Down
Loading