qt6.qtbase: fix the libexecdir in the pkg-config config file#210134
Merged
NickCao merged 1 commit intoNixOS:stagingfrom Jan 12, 2023
Merged
qt6.qtbase: fix the libexecdir in the pkg-config config file#210134NickCao merged 1 commit intoNixOS:stagingfrom
NickCao merged 1 commit intoNixOS:stagingfrom
Conversation
A few lines above this change, libexec is explicitly moved to the dev output. Therefore the pkg-config should point to it too.
13 tasks
LunNova
approved these changes
Jan 11, 2023
Member
|
There are a few other .pc files from qtbase, aren't they affected by this? If so, we can patch qtbase as such: diff --git a/cmake/PkgConfigLibrary.pc.in b/cmake/PkgConfigLibrary.pc.in
index 9393cec0c5..cc33e21409 100644
--- a/cmake/PkgConfigLibrary.pc.in
+++ b/cmake/PkgConfigLibrary.pc.in
@@ -1,9 +1,9 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-bindir=${prefix}/@INSTALL_BINDIR@
-libexecdir=${prefix}/@INSTALL_LIBEXECDIR@
-libdir=${prefix}/@INSTALL_LIBDIR@
-includedir=${prefix}/@INSTALL_INCLUDEDIR@
+bindir=@CMAKE_INSTALL_FULL_BINDIR@
+libexecdir=@CMAKE_INSTALL_FULL_LIBEXECDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
$<$<BOOL:@contains_mkspecs@>:mkspecsdir=${prefix}/@INSTALL_MKSPECSDIR@>
$<1: >
Name: @pkgconfig_name@(not that mkspecsdir is still broken, they are moved to $dev as well) |
Member
Author
None of the other modules have a libexec separately moved to the dev output and also don't override the .pc file. So it's just qtbase afaik. But I'm also not knowledgeable enough to confidently say for sure |
NickCao
approved these changes
Jan 11, 2023
Member
NickCao
left a comment
NickCao
left a comment
There was a problem hiding this comment.
Let's fix it as such until we encounter other issues.
ofborg
bot
added
10.rebuild-darwin: 11-100
LunNova
approved these changes
Jan 11, 2023
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
3 participants
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
A few lines above this change, libexec is explicitly moved to the dev output. Therefore the pkg-config should point to it too. This was causing qt6 builds from meson to not function correctly (see #208433 (comment))
cc: @LunNova @NickCao
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes