Skip to content

zvbi: fix darwin build#474396

Closed
kfiz wants to merge 103 commits intoNixOS:stagingfrom
kfiz:push-lvpswsuuwsyp
Closed

zvbi: fix darwin build#474396
kfiz wants to merge 103 commits intoNixOS:stagingfrom
kfiz:push-lvpswsuuwsyp

Conversation

@kfiz
Copy link
Contributor

@kfiz kfiz commented Dec 26, 2025

Build of zvbi currently breaks on darwin due to it searching for X11. This PR sets a configure flag to fix this.
@jopejoe1

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • [ x] aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • [ x] Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot requested a review from jopejoe1 December 26, 2025 18:45
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. labels Dec 26, 2025
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Dec 26, 2025
@kfiz
Copy link
Contributor Author

kfiz commented Dec 26, 2025

Just noticed. Need to rebase this to staging.

@kfiz kfiz marked this pull request as draft December 26, 2025 19:00
@kfiz kfiz force-pushed the push-lvpswsuuwsyp branch from 45fd560 to 48e82f4 Compare December 26, 2025 20:30
@kfiz kfiz changed the base branch from master to staging December 26, 2025 20:32
@nixpkgs-ci nixpkgs-ci bot closed this Dec 26, 2025
@nixpkgs-ci nixpkgs-ci bot reopened this Dec 26, 2025
github-actions[bot]

This comment was marked as resolved.

Sign in to view

drupol and others added 18 commits December 26, 2025 21:38
@drupol @kfiz
conntrack-tools: replace systemd with systemdLibs
243d0d3
@fabaff @kfiz
python313Packages.google-cloud-audit-log: 0.3.3 -> 0.4.0
9b61cb0 
Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-audit-log-v0.4.0/packages/google-cloud-audit-log/CHANGELOG.md
@r-ryantm @kfiz
python3Packages.llm-gemini: 0.28.1 -> 0.28.2
4c559fd
@r-ryantm @kfiz
aflplusplus: 4.34c -> 4.35c
b0738f5
@vcunat @kfiz
knot-resolver*_6: simplify path overrides
694bd7c
@bjornfor @kfiz
apk-tools: 2.14.10 -> 3.0.3
1e713ac 
Add zstd to prevent build failure.
@vcunat @kfiz
knot-resolver*_6: move extraFeatures to the -manager part
fb01618 
- reduces one layer of wrapper scripts
- reduces one layer of derivation in case of `extraFeatures = true`
- consequently overriding `extraFeatures = true` is simpler,
  and the nix code itself got simpler as well
@thegu5 @kfiz
pear-desktop: rename from youtube-music
e40c378
@bjornfor @kfiz
apk-tools: prepare for pkgs/by-name
6cb8282
@symphorien @kfiz
nixos/tests/os-prober.nix: fix
0885540
@vcunat @kfiz
nixos/knot-resolver: remove separate .package option
0be869e 
It was confusing, as you couldn't just pass anything,
because the path to kresd binary is hard-coded
in the manager package already.
@hraban @kfiz
spotify: 1.2.75.510 -> 1.2.78.418
73fe107 
The current content hashes are broken for me.  When I manually fetch the files
currently in master from the wayback machine and unpack the dmg I get a
different version from the one listed.  This is both an upgrade and a fix
@mio-19 @kfiz
linux/hardened/patches/6.12: v6.12.56-hardened1 -> v6.12.61-hardened1
cc66ea5
@thegu5 @kfiz
pear-desktop: migrate to by-name
b2f7506
@ToasterUwU @kfiz
edmarketconnector: 5.13.3 -> 6.0.0
609ff43
@bjornfor @kfiz
apk-tools: move to pkgs/by-name
ddfdc17
@bcdarwin @kfiz
itk: 5.4.4 -> 5.4.5
2cac41d
@r-ryantm @kfiz
samrewritten: 20250919.1 -> 20251216.1
c156b94
@kfiz kfiz force-pushed the push-lvpswsuuwsyp branch from 48e82f4 to 2b53f77 Compare December 26, 2025 20:46
@github-actions github-actions bot dismissed their stale review December 26, 2025 20:47

All good now, thank you!

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: kernel The Linux kernel 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: documentation This PR adds or changes documentation and removed 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Dec 26, 2025
@kfiz kfiz marked this pull request as ready for review December 26, 2025 21:30
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 27, 2025
@kfiz
Copy link
Contributor Author

kfiz commented Jan 1, 2026

This is fixed for me now after the recent `staging-next merge: #471587

@kfiz kfiz closed this Jan 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@jopejoe1 jopejoe1 Awaiting requested review from jopejoe1

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: darwin Running or building packages on Darwin 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: kernel The Linux kernel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: module (update) This PR changes an existing module in `nixos/` 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: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.