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
vulkan-loader: fix pkg-config include directory #108890
Conversation
This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch) Result of 1 package built:
|
Thanks! Unfortunately I don't know anything about the cmake infrastructure involved here so I'm not a great reviewer. Wouldn't setting |
Result of 9 packages marked as broken and skipped:
|
Yes, this could happen. When I prefer this behavior over a silently failing |
--replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@' | ||
''; | ||
# Set CMAKE_INSTALL_INCLUDEDIR to the vulkan-headers directory | ||
include = vulkan-headers; |
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.
This feels like a hack, overriding the variables related to output. Would not setting cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}" ];
be enough.
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.
You are right, setting cmakeFlags
is enough to change the install path. I have tried to do this the first time, but I must have checked the vulkan.pc
in a outdated result-dev
link or something, because it didn't work for me. Therefore I came up with this hack.
I will update the PR.
With the last update the pkg-config file was changed to cmake variables, which made substituteInPlace ineffective. Fixes NixOS#108766
409a363
to
0fe70e7
Compare
I updated the PR to not use the output "hack" anymore, but simply set I also included a simple |
Looks good, thanks. |
This change seems to have broken grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc But
There is no reference to Is the added |
Yes, the |
Really? My build-attempt from
|
Disregard... I'm just an idiot that forgot I overloaded the |
Motivation for this change
With the last update the pkg-config file was changed to cmake variables, which made substituteInPlace ineffective.
Fixes #108766
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)