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

lomiri.* Fix lack of output fixup in pkg-config files, update pkg-config calls with new CMake option #303595

Merged
merged 5 commits into from
Apr 13, 2024

Conversation

OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Apr 12, 2024

Description of changes

  1. I noticed that some pkg-config files didn't get patched with the correct outputs ($dev for includedir). It didn't cause any issues so far, but let's fix them anyway. In the case of u1db-qt, the pkg-config file actually has a completely broken includedir.

  2. Also, since we now have a newer CMake, we can start adjusting the substitutions on pkg-config calls to just add a prefix substitution, instead of replacing them entirely with path hardcodings.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@OPNA2608 OPNA2608 marked this pull request as ready for review April 13, 2024 07:22
@OPNA2608
Copy link
Contributor Author

Result of nixpkgs-review pr 303595 run on x86_64-linux 1

23 packages built:
  • lomiri.biometryd
  • lomiri.biometryd.dev
  • lomiri.content-hub
  • lomiri.content-hub.dev
  • lomiri.content-hub.examples
  • lomiri.deviceinfo
  • lomiri.deviceinfo.bin
  • lomiri.deviceinfo.dev
  • lomiri.hfd-service
  • lomiri.lomiri-download-manager
  • lomiri.lomiri-download-manager.dev
  • lomiri.lomiri-system-settings
  • lomiri.lomiri-system-settings-security-privacy
  • lomiri.lomiri-system-settings-unwrapped
  • lomiri.lomiri-system-settings-unwrapped.dev
  • lomiri.morph-browser
  • lomiri.trust-store
  • lomiri.trust-store.bin
  • lomiri.trust-store.dev
  • lomiri.trust-store.doc
  • lomiri.u1db-qt
  • lomiri.u1db-qt.dev
  • lomiri.u1db-qt.examples

Also checked on top of #292872, no issues there.

@OPNA2608 OPNA2608 merged commit 5ff6283 into NixOS:master Apr 13, 2024
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant