Skip to content

openssl: fix cmake files generation#477258

Open
marcin-serwin wants to merge 1 commit intoNixOS:stagingfrom
marcin-serwin:push-tnkrssyymwyk
Open

openssl: fix cmake files generation#477258
marcin-serwin wants to merge 1 commit intoNixOS:stagingfrom
marcin-serwin:push-tnkrssyymwyk

Conversation

@marcin-serwin
Copy link
Contributor

@marcin-serwin marcin-serwin commented Jan 5, 2026

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot requested review from thillux and ulrikstrid January 5, 2026 20:15
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 5, 2026
marcin-serwin added a commit to marcin-serwin/nixpkgs that referenced this pull request Jan 6, 2026
@marcin-serwin
setup-hooks/multiple-outputs: remove pkg-config file patching
bd34870 
This was added with initial implemention of multiple outputs:
<NixOS#7701>.

Problems with the generated pkg-config modules should be addressed at
the package level through correct configuration. The current approach
hides problems that resurface later (e.g., incorrectly generated cmake
config files in <NixOS#477258>) and is
sometimes not enough requiring further patching (e.g., see the removed
`postFixup` in <NixOS#477412>).

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
@marcin-serwin marcin-serwin mentioned this pull request Jan 6, 2026
Draft
13 tasks
@thillux
Copy link
Contributor

thillux commented Jan 8, 2026 •
edited
Loading

Did you actually test this? I looked at the generated cmake files, and they still do not differentiate between multiple outputs for headers and binary libraries.

@thillux
Copy link
Contributor

thillux commented Jan 8, 2026

Do you have a publicly available package, where you want to use cmake, that I can test against?

@marcin-serwin
Copy link
Contributor Author

marcin-serwin commented Jan 8, 2026

Did you actually test this? I looked at the generated cmake files, and they still do not differentiate between multiple outputs for headers and binary libraries.

What do you mean? When I build it I see:

set(OPENSSL_LIBRARY_DIR "${_ossl_prefix}/lib")
set(OPENSSL_INCLUDE_DIR "${_ossl_prefix}/../gz0bnj84p0vv8njnb624yhdwqq0ay2bd-openssl-3.6.0-dev/include")

so they seem to be differentiated.

Do you have a publicly available package, where you want to use cmake, that I can test against?

remmina uses find_package(OpenSSL) in its main CMakeLists.txt: https://gitlab.com/Remmina/Remmina/-/blob/9b586bfd343dbd6cad848d87bef8ee2dcb2975dc/CMakeLists.txt#L484

thillux
thillux approved these changes Feb 13, 2026
View reviewed changes
Copy link
Contributor

@thillux thillux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Feb 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ulrikstrid ulrikstrid Awaiting requested review from ulrikstrid

1 more reviewer

@thillux thillux thillux approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@marcin-serwin @thillux

Comments