colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

pipewire: remove upstreamed libcamera patch

Browse Source
This commit is contained in:
Colin
2024-12-31 07:32:31 +00:00
parent 7093385f98
commit 6b0a78bee0
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hosts/common/programs/pipewire/default.nix
View File

@@ -49,16 +49,6 @@ in
# disabling systemd causes pipewire to be built with direct udev support instead. # disabling systemd causes pipewire to be built with direct udev support instead.
# i added this probably because i don't use system'd logind? # i added this probably because i don't use system'd logind?
enableSystemd = false; enableSystemd = false;
# XXX(2024-11-29): patch to fix camera support on moby.
# see: <https://github.com/NixOS/nixpkgs/pull/353336>
# 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 = [ suggestedPrograms = [

8
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -31,14 +31,6 @@ in
[ [
./2024-10-01-python-cross-resource-usage.patch ./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' { (fetchpatch' {
# merged into staging 2024/12/12 # merged into staging 2024/12/12
name = "unbound: bison is required when cross-compiling"; name = "unbound: bison is required when cross-compiling";