nixpkgs
nixpkgs copied to clipboard
argyllcms: refactor and fix build on darwin
Description of changes
The goal is to make the build pass on aarch64-darwin.
- I replaced the not-so-maintainable complete replacement of
Jamtop(it doesn't seem to be a very common build tool either) with some manual overrides at the end of it. If upstream changes some logic inJamtop, there is most likely less (or none) maintenance on nixpkgs needed. - I added the necessary libraries and flags for
darwin. - I now set also
DESTDIRto be the derivation output, with an emptyPREFIX. This produces the desired output, both in output and the logs (no double slashes, e.g.//nix/store/...).
Things done
- Built on platform(s)
- [x] x86_64-linux
- [x] aarch64-linux
- [ ] x86_64-darwin
- [x] aarch64-darwin
- For non-Linux: Is sandboxing enabled in
nix.conf? (See Nix manual)- [x]
sandbox = relaxed - [ ]
sandbox = true
- [x]
- [ ] Tested, as applicable:
- NixOS test(s) (look inside nixos/tests)
- and/or package tests
- or, for functions and "core" functionality, tests in lib/tests or pkgs/test
- made sure NixOS tests are linked to the relevant packages
- [ ] 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 - [x] Tested basic functionality of all binary files (usually in
./result/bin/) - 24.11 Release Notes (or backporting 23.11 and 24.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
- [x] Fits CONTRIBUTING.md.
Add a :+1: reaction to pull requests you find important.
Result of nixpkgs-review pr 327321 run on aarch64-darwin 1
6 packages marked as broken and skipped:
- gruvbox-gtk-theme
- mojave-gtk-theme
- nightfox-gtk-theme
- tokyonight-gtk-theme
- vimix-gtk-themes
- whitesur-gtk-theme
Thanks @afh, all suggestions applied.
Thanks for addressing the suggestions, @zaninime, much appreciated. I left a few more comments and questions above 🙂
The good news: Building this PR package locally was successful using: nix build github:NixOS/nixpkgs/pull/327321/merge#argyllcms 🎉