Skip to content
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

Jump to bottom

vulkan-loader: fix pkgconfig libdir path #97679

Merged
merged 1 commit into from Sep 24, 2020
Merged

vulkan-loader: fix pkgconfig libdir path #97679

merged 1 commit into from Sep 24, 2020

Conversation

acowley
Copy link
Contributor

@acowley acowley commented Sep 10, 2020

Motivation for this change

The current vulkan.pc looks like this,

prefix=/nix/store/i4gpn47f359vdamcr40ada4nxpf6j9iz-vulkan-loader-1.2.131.2
exec_prefix=/nix/store/i4gpn47f359vdamcr40ada4nxpf6j9iz-vulkan-loader-1.2.131.2
libdir=${exec_prefix}//nix/store/i4gpn47f359vdamcr40ada4nxpf6j9iz-vulkan-loader-1.2.131.2/lib
includedir=/nix/store/spmvmf3gxcgrych5kiax3lv3wanbybc9-vulkan-headers-1.2.131.1/include

Name: Vulkan-Loader
Description: Vulkan Loader
Version: 1.2.131
Libs: -L${libdir} -lvulkan
Libs.private:  -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc
Cflags: -I${includedir}
Things done

With this change, vulkan.pc looks like this,

prefix=/nix/store/xl93a0vf6z98q39dy7i6405hdsk7khp1-vulkan-loader-1.2.131.2
exec_prefix=/nix/store/xl93a0vf6z98q39dy7i6405hdsk7khp1-vulkan-loader-1.2.131.2
libdir=/nix/store/xl93a0vf6z98q39dy7i6405hdsk7khp1-vulkan-loader-1.2.131.2/lib
includedir=/nix/store/spmvmf3gxcgrych5kiax3lv3wanbybc9-vulkan-headers-1.2.131.1/include

Name: Vulkan-Loader
Description: Vulkan Loader
Version: 1.2.131
Libs: -L${libdir} -lvulkan
Libs.private:  -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc
Cflags: -I${includedir}
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from Ralith September 10, 2020 17:33
danieldk
danieldk suggested changes Sep 20, 2020
View reviewed changes
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

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

Only a small nitpick.

pkgs/development/libraries/vulkan-loader/default.nix Outdated Show resolved Hide resolved
@ofborg ofborg bot requested a review from Ralith September 23, 2020 17:09
@danieldk
Copy link
Contributor

@ofborg build libplacebo

@danieldk danieldk merged commit 2504403 into NixOS:master Sep 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danieldk danieldk danieldk approved these changes

@Ralith Ralith Ralith approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@acowley @danieldk @Ralith