openssl_3_3: hotfix for cmake builds#343991
Merged
emilazy merged 1 commit intoNixOS:stagingfrom Sep 23, 2024
Merged
Conversation
Contributor
Author
|
This should fix the issue brought up in #339614 after it was merged. |
Contributor
Author
|
CC @trofi |
Member
|
Checking the I’m curious why they added these in the first place. CMake‐specific build configuration feels like a step back from |
2cce768 to
4d6deac
Compare
Signed-off-by: Markus Theil <theil.markus@gmail.com>
4d6deac to
fd1745b
Compare
Contributor
Author
|
I currently have no idea, if a simple workaround besides removing/fixing the Cmake files will be possible. |
Member
|
Oh, this is targeting Will open another PR. |
13 tasks
Member
13 tasks
This file contains hidden or 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
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.
Description of changes
OpenSSL starting with 3.3.x includes CMake-based definitions/helpers, additional to the pkg-config-based files used before. Remove these for now, as they are not adapted to Nix-Paths.
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.