valgrind: don't use FreeBSD kernel version, use libc version #387383
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
github-actions
bot
added
10.rebuild-darwin: 0
JohnRTitor
reviewed
Mar 18, 2025
| @@ -49,8 +49,7 @@ stdenv.mkDerivation rec { | |||
| separateDebugInfo = stdenv.hostPlatform.isLinux; | |||
|
|
|||
| preConfigure = lib.optionalString stdenv.hostPlatform.isFreeBSD '' | |||
| substituteInPlace configure --replace '`uname -r`' \ | |||
| ${toString stdenv.hostPlatform.parsed.kernel.version}.0- | |||
| substituteInPlace configure --replace '`uname -r`' ${stdenv.cc.libc.version}- | |||
There was a problem hiding this comment.
Suggested change
| substituteInPlace configure --replace '`uname -r`' ${stdenv.cc.libc.version}- | |
| substituteInPlace configure --replace-fail '`uname -r`' ${stdenv.cc.libc.version}- |
rhelmot
force-pushed
the
freebsd-valgrind-version
branch
from
b74daa0 to
b89159a
Compare
|
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.
Since #211627, we have removed the version number from our FreeBSD system double (pull request for this eludes me). Valgrind still requires it, so we provide the version number from libc, which is probably what it wants anyway.
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.