diff --git a/hosts/common/programs/pipewire/default.nix b/hosts/common/programs/pipewire/default.nix index 69b318c75..7492457a3 100644 --- a/hosts/common/programs/pipewire/default.nix +++ b/hosts/common/programs/pipewire/default.nix @@ -49,16 +49,6 @@ in # disabling systemd causes pipewire to be built with direct udev support instead. # i added this probably because i don't use system'd logind? enableSystemd = false; - # XXX(2024-11-29): patch to fix camera support on moby. - # see: - # this is identical to the above patch, but less costly than cherry-picking it into nixpkgs-bootstrap, - # as that would force mass rebuilds. - # **remove once 353336 is merged**. - libcamera = pkgs.libcamera.overrideAttrs (upstream: { - postFixup = (upstream.postFixup or "") + '' - ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so - ''; - }); }; suggestedPrograms = [ diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index f04f567fd..38628d4b4 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -31,14 +31,6 @@ in [ ./2024-10-01-python-cross-resource-usage.patch - # merged into staging-next 2024-11-28; cherry picking causes mass rebuild. - # remove targeted patch in pipewire.nix once mainline - # (fetchpatch' { - # name = "libcamera: re-sign IPA modules after fixup"; - # prUrl = "https://github.com/NixOS/nixpkgs/pull/353336"; - # hash = "sha256-RzpQQ5452QSydPGHYRSo5r2OT08rLCz0X+g121SnlR4="; - # }) - (fetchpatch' { # merged into staging 2024/12/12 name = "unbound: bison is required when cross-compiling";