Skip to content

openssl_3_3: hotfix for cmake builds#343991

Merged
emilazy merged 1 commit intoNixOS:stagingfrom
thillux:openssl-3.3-cmake
Sep 23, 2024
Merged

openssl_3_3: hotfix for cmake builds#343991
emilazy merged 1 commit intoNixOS:stagingfrom
thillux:openssl-3.3-cmake

Conversation

@thillux
Copy link
Contributor

@thillux thillux commented Sep 23, 2024

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

  • 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.

@thillux
Copy link
Contributor Author

thillux commented Sep 23, 2024

This should fix the issue brought up in #339614 after it was merged.

@thillux thillux requested a review from emilazy September 23, 2024 16:03
@thillux
Copy link
Contributor Author

thillux commented Sep 23, 2024

CC @trofi

@emilazy
Copy link
Member

emilazy commented Sep 23, 2024

Checking the aarch64-linux build of Mumble now. This will rebuild a lot of packages, including a complete stdenv bootstrap for Darwin. Would it be possible to work around further downstream? I guess we expect this would break basically every single package that uses CMake and OpenSSL?

I’m curious why they added these in the first place. CMake‐specific build configuration feels like a step back from pkg-config.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
@thillux
Copy link
Contributor Author

thillux commented Sep 23, 2024

I currently have no idea, if a simple workaround besides removing/fixing the Cmake files will be possible.

@thillux thillux marked this pull request as ready for review September 23, 2024 17:02
@thillux thillux requested a review from ulrikstrid September 23, 2024 17:03
@emilazy emilazy merged commit b2de93c into NixOS:staging Sep 23, 2024
@emilazy
Copy link
Member

emilazy commented Sep 23, 2024

Oh, this is targeting staging instead of staging-next

Will open another PR.

@emilazy
Copy link
Member

emilazy commented Sep 23, 2024

#344049

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants