zlib: fix static library path in pkg-config module#476830
Merged
doronbehar merged 1 commit intoNixOS:stagingfrom Jan 25, 2026
Merged
zlib: fix static library path in pkg-config module#476830doronbehar merged 1 commit intoNixOS:stagingfrom
doronbehar merged 1 commit intoNixOS:stagingfrom
Conversation
Specify the correct paths for installation in configuration phase. This fixes the created pkg-config module and saves us from needing to move files manually into the desired outputs. Fixes: NixOS#66461 Signed-off-by: Marcin Serwin <marcin@serwin.dev>
13 tasks
doronbehar
approved these changes
Jan 21, 2026
Contributor
doronbehar
left a comment
There was a problem hiding this comment.
Changes LGTM, and I endorse this change.
Contributor
|
I'm testing this change now, and will take a look at the files it produces. If everything looks fine to me, I will merge it. |
Contributor
|
Looks perfectly fine to me: tree $(nix build --no-link --print-out-paths -Lf. zlib.{out,dev,static})Prints: And: cat /nix/store/x1ahgp3wkj4542lmkijg6sdybpw2blk1-zlib-1.3.1-dev/share/pkgconfig/zlib.pcShows: |
Member
|
This might have broken the build on windows - these both work on master and fail after this PR
with |
marcin-serwin
added a commit
to marcin-serwin/nixpkgs
that referenced
this pull request
Feb 15, 2026
The install script ignores the configured libdir in case of windows. We could move it manually like it was done before <NixOS#476830> but even before that we did not move `libz.dll.a` so I think it makes sense to just disable this split on windows. Fixes: NixOS#476830 (comment) Signed-off-by: Marcin Serwin <marcin@serwin.dev>
13 tasks
doronbehar
added a commit
to doronbehar/nixpkgs
that referenced
this pull request
Feb 15, 2026
Help prepare to remove `zlib`'s `"static"` output, see related issues: - NixOS#490608 - NixOS#66461 - NixOS#476830
doronbehar
added a commit
to doronbehar/nixpkgs
that referenced
this pull request
Feb 15, 2026
Help prepare to remove `zlib`'s `"static"` output, see related issues: - NixOS#490608 - NixOS#66461 - NixOS#476830
alexfmpe
pushed a commit
to alexfmpe/nixpkgs
that referenced
this pull request
Feb 18, 2026
The install script ignores the configured libdir in case of windows. We could move it manually like it was done before <NixOS#476830> but even before that we did not move `libz.dll.a` so I think it makes sense to just disable this split on windows. Fixes: NixOS#476830 (comment) Signed-off-by: Marcin Serwin <marcin@serwin.dev>
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.
Specify the correct paths for installation in configuration phase. This fixes the created pkg-config module and saves us from needing to move files manually into the desired outputs.
Fixes: #66461
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.