diff --git a/flake.lock b/flake.lock index f5900fd..ce967fb 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1776454077, - "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", + "lastModified": 1776661682, + "narHash": "sha256-X32LTSDqUdVqMy85WYdRgyt0I75wc4Lhi9j+lrCDR8w=", "owner": "nix-community", "repo": "home-manager", - "rev": "565e5349208fe7d0831ef959103c9bafbeac0681", + "rev": "4bfce11ea820df0359f73736fd59c7e8f53641a6", "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": 1776663782, + "narHash": "sha256-qzBBuxZbn7vPD9ZDl3xmCBGa6qEc8Q//76Cbx4W0tE4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d453f29dbf13541981f8acd558fb6b88e5fd7af6", + "rev": "b93be06dc91630bf0ced69c54d0e1e05e56ae460", "type": "github" }, "original": { diff --git a/hosts/hardware/FredOS-Macbook.nix b/hosts/hardware/FredOS-Macbook.nix index 7b15780..bc8e658 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: { + 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 + sed -i '/\.wait_finish[[:space:]]*=.*vb2_ops_wait_finish/d' fthd_v4l2.c + ''; + }); + }); + }) + ]; + nixpkgs.config.allowInsecurePredicate = pkg: (lib.hasPrefix "broadcom-sta" (lib.getName pkg));