-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
qpdf: split outputs; modernize #326390
qpdf: split outputs; modernize #326390
Conversation
5f2c5ea
to
5bed75a
Compare
5bed75a
to
3a571c3
Compare
rebased onto staging as this will cause mass rebuilds |
@ofborg eval |
3a571c3
to
3beee00
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good overall!
3beee00
to
c801f38
Compare
c801f38
to
e3a3091
Compare
Splitting outputs sometimes causes breakages in dependent packages... I tested the build locally, (against
The only problem I found, was the contents of # The installation prefix configured by this project.
set(_IMPORT_PREFIX "/nix/store/rcz5hfbl23hg02330dwff1isbw6haicf-qpdf-11.9.1")
# Create imported target qpdf::libqpdf
add_library(qpdf::libqpdf SHARED IMPORTED)
set_target_properties(qpdf::libqpdf PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
)
# Create imported target qpdf::libqpdf_static
add_library(qpdf::libqpdf_static STATIC IMPORTED)
set_target_properties(qpdf::libqpdf_static PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
INTERFACE_LINK_LIBRARIES "/nix/store/rc18a8k50zmrif61250sfidkqvlg41ln-zlib-1.3.1/lib/libz.so;/nix/store/0dsiifpjc1cxbaa8d6b0kc6d2wijk7in-libjpeg-turbo-3.0.3/lib/libjpeg.so"
) Note how the |
e3a3091
to
f9330b6
Compare
Thanks for catching this! I've built a few packages with this change as well and all seems good :) |
I imagine that the packages you tested were using the pkgconfig file, and not the cmake API. However, inspecting in a similar manner the outputs' contents shows promising prospect. |
I will merge once ofborg evaluation is finished. |
Description of changes
Came across
lib.getExe
not working with this package in #326372Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-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.