Skip to content

graphite2: point to correct includedir in the .pc file#395765

Merged
7c6f434c merged 1 commit intoNixOS:stagingfrom
marcin-serwin:push-otxzmwxynzuk
Apr 4, 2025
Merged

graphite2: point to correct includedir in the .pc file#395765
7c6f434c merged 1 commit intoNixOS:stagingfrom
marcin-serwin:push-otxzmwxynzuk

Conversation

@marcin-serwin
Copy link
Contributor

The CMakeLists.txt assumes that the include headers will end up in the same directory as the lib files. This is not the case in this derivation since we separate out from dev making the emitted .pc file reference nonexisting directory.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

The CMakeLists.txt assumes that the include headers will end up in the
same directory as the lib files. This is not the case in this derivation
since we separate out from dev making the emitted .pc file reference
nonexisting directory.
@marcin-serwin marcin-serwin requested a review from 7c6f434c April 3, 2025 13:39
@github-actions github-actions bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Apr 3, 2025
@7c6f434c 7c6f434c merged commit 4dab2ff into NixOS:staging Apr 4, 2025
26 of 27 checks passed
@marcin-serwin marcin-serwin deleted the push-otxzmwxynzuk branch June 23, 2025 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants