From 3b4714c72293bd8f4415cae54273f1f108d12eb5 Mon Sep 17 00:00:00 2001 From: ediblerope <172910558+ediblerope@users.noreply.github.com> Date: Sun, 19 Apr 2026 05:52:25 +0000 Subject: [PATCH 1/4] flake: update inputs --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f5900fd..c2f19ee 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1776454077, - "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", + "lastModified": 1776562531, + "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=", "owner": "nix-community", "repo": "home-manager", - "rev": "565e5349208fe7d0831ef959103c9bafbeac0681", + "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4", "type": "github" }, "original": { @@ -95,11 +95,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1776386586, - "narHash": "sha256-eVAUaL/6n8mnmBiPpEVW1NDNVSKLWhYVfycG+P0SvWU=", + "lastModified": 1776535646, + "narHash": "sha256-ynXxDJ66ZgN7NlXuMxH9aIMnmiX4Q4ZhdEDie9Klnfc=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "c65c3faf90ae07bae101c15ef502f0bcb06c5d74", + "rev": "c5b2b559d888644417de5eb3939548854fa4d837", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776311487, - "narHash": "sha256-9U8bL9X/0R9cZD3Uc/mN37AWvv5dB4WQqqjLRAxQfas=", + "lastModified": 1776475594, + "narHash": "sha256-mxLieVl5lqjd+QUvgHbvpVrvb9d8zox7m+MiRO6FHu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc1e0e027707ad53dddae39d3b3e992262c7d8c7", + "rev": "9a3a5b8400951b3497d2ef8f239f8451175cf3a1", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1776488873, - "narHash": "sha256-VOYDLF8/Jderf6riz3PyiCQhsCUfpd4S9NmDT/URgYI=", + "lastModified": 1776538405, + "narHash": "sha256-qjo8xO4p/Kn4OrtVwkW8XPH0xaHq5QLu6MMhSf+gJ/w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d453f29dbf13541981f8acd558fb6b88e5fd7af6", + "rev": "179a2e63531541cb009208c913d7ddf7046ea2b6", "type": "github" }, "original": { From 293e3306b3eb17a60e02f5bdd6f78495966f0e97 Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 19 Apr 2026 11:18:58 +0000 Subject: [PATCH 2/4] facetimehd: patch out wait_prepare/wait_finish for Linux 7.0 struct vb2_ops dropped wait_prepare and wait_finish in Linux 6.8. Add a nixpkgs overlay to sed them out of fthd_v4l2.c at build time. https://claude.ai/code/session_01XEMg2HskwRaQW3nrCd1q2z --- hosts/hardware/FredOS-Macbook.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hosts/hardware/FredOS-Macbook.nix b/hosts/hardware/FredOS-Macbook.nix index 7b15780..4123d54 100644 --- a/hosts/hardware/FredOS-Macbook.nix +++ b/hosts/hardware/FredOS-Macbook.nix @@ -34,6 +34,20 @@ hardware.enableRedistributableFirmware = true; hardware.facetimehd.enable = true; + # wait_prepare/wait_finish were removed from struct vb2_ops in Linux 6.8 + nixpkgs.overlays = [ + (final: prev: { + linuxPackagesFor = kernel: (prev.linuxPackagesFor kernel).extend (lpFinal: lpPrev: { + facetimehd = lpPrev.facetimehd.overrideAttrs (old: { + postPatch = (old.postPatch or "") + '' + sed -i '/\.wait_prepare[[:space:]]*=.*vb2_ops_wait_prepare/d' fthd_v4l2.c + sed -i '/\.wait_finish[[:space:]]*=.*vb2_ops_wait_finish/d' fthd_v4l2.c + ''; + }); + }); + }) + ]; + nixpkgs.config.allowInsecurePredicate = pkg: (lib.hasPrefix "broadcom-sta" (lib.getName pkg)); From 2b09eae3fb1ff6d1356f8a7a90c8ead61c4ee0bd Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 19 Apr 2026 11:25:26 +0000 Subject: [PATCH 3/4] facetimehd: fix overlay to extend linuxPackages_latest directly Overriding linuxPackagesFor doesn't affect the already-evaluated linuxPackages_latest attribute. Extend it directly so the patched facetimehd is picked up by boot.kernelPackages = pkgs.linuxPackages_latest. https://claude.ai/code/session_01XEMg2HskwRaQW3nrCd1q2z --- hosts/hardware/FredOS-Macbook.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/hardware/FredOS-Macbook.nix b/hosts/hardware/FredOS-Macbook.nix index 4123d54..bc8e658 100644 --- a/hosts/hardware/FredOS-Macbook.nix +++ b/hosts/hardware/FredOS-Macbook.nix @@ -37,7 +37,7 @@ # wait_prepare/wait_finish were removed from struct vb2_ops in Linux 6.8 nixpkgs.overlays = [ (final: prev: { - linuxPackagesFor = kernel: (prev.linuxPackagesFor kernel).extend (lpFinal: lpPrev: { + linuxPackages_latest = prev.linuxPackages_latest.extend (lpFinal: lpPrev: { facetimehd = lpPrev.facetimehd.overrideAttrs (old: { postPatch = (old.postPatch or "") + '' sed -i '/\.wait_prepare[[:space:]]*=.*vb2_ops_wait_prepare/d' fthd_v4l2.c From 35ffa8593d8667bbf2bd063550df09361c5fc804 Mon Sep 17 00:00:00 2001 From: ediblerope <172910558+ediblerope@users.noreply.github.com> Date: Mon, 20 Apr 2026 06:08:17 +0000 Subject: [PATCH 4/4] flake: update inputs --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c2f19ee..ce967fb 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1776562531, - "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=", + "lastModified": 1776661682, + "narHash": "sha256-X32LTSDqUdVqMy85WYdRgyt0I75wc4Lhi9j+lrCDR8w=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4", + "rev": "4bfce11ea820df0359f73736fd59c7e8f53641a6", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1776538405, - "narHash": "sha256-qjo8xO4p/Kn4OrtVwkW8XPH0xaHq5QLu6MMhSf+gJ/w=", + "lastModified": 1776663782, + "narHash": "sha256-qzBBuxZbn7vPD9ZDl3xmCBGa6qEc8Q//76Cbx4W0tE4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "179a2e63531541cb009208c913d7ddf7046ea2b6", + "rev": "b93be06dc91630bf0ced69c54d0e1e05e56ae460", "type": "github" }, "original": {