diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 9434c314..0284cb4e 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -32,6 +32,20 @@ in [ # etc, where "date" is like "20240228181608" # and can be found with `nix-repl > :lf . > lastModifiedDate` + # branch: wip-ffado-cross + (fetchpatch' { + title = "dbus_cplusplus: support cross compilation"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/307420"; + saneCommit = "f59a0e42ece4a1f9af4be3bd09e488b970670207"; + hash = "sha256-sMfLKzKVb+gyTUkeVP3irPu6YYk+TGFei6kxoZnujfE="; + }) + (fetchpatch' { + # TODO: send out for review (after jtolnar's stuff is merged) + title = "ffado: support cross compilation"; + saneCommit = "b0b57ad3c723a74d566f6420dffdb1a7d05304e2"; + hash = "sha256-NwTZJG/+ngzR4IrYOd07KxMybHbYLmDcw4RSIrpbx3U="; + }) + (fetchpatch' { # see: title = "nixos/lemmy: fix nginx backend to proxy needed headers"; diff --git a/overlays/preferences.nix b/overlays/preferences.nix index 32a123c9..9518b1d8 100644 --- a/overlays/preferences.nix +++ b/overlays/preferences.nix @@ -44,14 +44,14 @@ squeekboard = null; }; - pipewire = super.pipewire.override { - # avoid a dep on python3.10-PyQt5, which has mixed qt5 versions. - # this means we lose firewire support (oh well..?) - # N.B.: ffado is already disabled for cross builds: this is only to prevent weird `targetPackages` related stuff. - # try `nix build '.#hostPkgs.moby.megapixels'` for example - ffadoSupport = false; - # ffado = null; - }; + # pipewire = super.pipewire.override { + # # avoid a dep on python3.10-PyQt5, which has mixed qt5 versions. + # # this means we lose firewire support (oh well..?) + # # N.B.: ffado is already disabled for cross builds: this is only to prevent weird `targetPackages` related stuff. + # # try `nix build '.#hostPkgs.moby.megapixels'` for example + # ffadoSupport = false; + # # ffado = null; + # }; # pythonPackagesExtensions = super.pythonPackagesExtensions ++ [ # (pySelf: pySuper: {