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

mupdf: Improve pkg-config file #4

Conversation

OPNA2608
Copy link

@OPNA2608 OPNA2608 commented Feb 4, 2024

Description of changes

  • Use variable substitution to base paths on prefix
    • multiple-outputs hook takes care of applying corrections as needed
  • Actually use the variables in Cflags & Libs

Gives:

prefix=/nix/store/qs7s1r5z3k2nb7c4c31k3k4zs7bz6h4h-mupdf-1.23.5
libdir=${prefix}/lib
includedir=/nix/store/9k7v3h2ykh92bahprg04y1cngpri7dpv-mupdf-1.23.5-dev/include

Name: mupdf
Description: Library for rendering PDF documents
Version: 1.23.5
Libs: -L${libdir} -lmupdf
Cflags: -I${includedir}

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.

lilyinstarlight and others added 2 commits December 7, 2023 21:01
- Use variable substitution to base paths on prefix
  - multiple-outputs hook takes care of applying corrections as needed
- Actually use the variables in Cflags & Libs
@lilyinstarlight lilyinstarlight force-pushed the fix/mupdf-pkg-config-includedir branch from add9880 to 336faa6 Compare February 4, 2024 22:07
@lilyinstarlight
Copy link
Owner

Diff applied to base branch, thank you!

lilyinstarlight pushed a commit that referenced this pull request Feb 22, 2024
Since ba83271 the build fails with

    applying patch /nix/store/46rxbbvl2l3mrxb50y9rzy7ahgx0lraj-d741901dddd731895346636c0d3556c6fa51fbe6.patch
    patching file tests/hazmat/primitives/test_aead.py
    Hunk #1 FAILED at 56.
    Hunk #2 FAILED at 197.
    Hunk #3 FAILED at 378.
    Hunk #4 FAILED at 525.
    Hunk #5 FAILED at 700.
    Hunk NixOS#6 FAILED at 844.
    6 out of 6 hunks FAILED -- saving rejects to file tests/hazmat/primitives/test_aead.py.rej
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants