diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix index a0923668d..00bb340a2 100644 --- a/hosts/common/programs/assorted.nix +++ b/hosts/common/programs/assorted.nix @@ -367,7 +367,7 @@ in # "tdesktop" # broken on phosh # "tokodon" "tuba" # mastodon/pleroma client (stores pw in keyring) - # "v4l-utils" # for `media-ctl`; to debug cameras: (2025/07/16: disabled because broken cross build) + # "v4l-utils" # for `media-ctl`; to debug cameras: "video-trimmer" "vulkan-tools" # vulkaninfo # "whalebird" # pleroma client (Electron). input is broken on phosh. @@ -874,9 +874,9 @@ in meson = {}; - millipixels.packageUnwrapped = pkgs.millipixels.override { - v4l-utils = config.sane.programs.v4l-utils.packageUnwrapped; # necessary for cross compilation - }; + # millipixels.packageUnwrapped = pkgs.millipixels.override { + # v4l-utils = config.sane.programs.v4l-utils.packageUnwrapped; # necessary for cross compilation + # }; millipixels.sandbox.method = null; #< TODO: sandbox # actual monero blockchain (not wallet/etc; safe to delete, just slow to regenerate) diff --git a/hosts/common/programs/v4l-utils.nix b/hosts/common/programs/v4l-utils.nix index 01554bdbc..85c3d3c54 100644 --- a/hosts/common/programs/v4l-utils.nix +++ b/hosts/common/programs/v4l-utils.nix @@ -10,12 +10,14 @@ # - `v4l2-ctl -d /dev/video1 --all` (front camera?) # - `v4l2-ctl -d /dev/video2 --all` (rear camera?) # - `v4l2-ctl --list-ctrls-menus -d /dev/video1` (show rotation/flips) -{ pkgs, ... }: +{ ... }: { sane.programs.v4l-utils = { - packageUnwrapped = pkgs.v4l-utils.override { - withGUI = false; #< XXX(2024-09-09): gui does not cross compile due to qtbase / wrapQtAppsHook - }; + # packageUnwrapped = pkgs.v4l-utils.override { + # # XXX(2024-09-09): gui does not cross compile due to qtbase / wrapQtAppsHook + # # XXX(2025-08-06): v4l-utils cross compiles, thanks to + # withGUI = false; + # }; sandbox.method = null; #< TODO: sandbox }; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index 1847aeeb0..f341eb7f7 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -45,6 +45,12 @@ in # TODO: enable, once i can tolerate a mass rebuild # (fetchpatch' { + # # 2025-08-06: merged into staging + # name = "v4l-utils: fix cross-compilation"; + # prUrl = "https://github.com/NixOS/nixpkgs/pull/429900"; + # hash = "sha256-oH9jTG38mWpjwf/LH3MTCrBm2NC4WTRPki2mUhCc5WQ="; + # }) + # (fetchpatch' { # name = "libpcap: enable dbus, rdma, bluetooth features"; # prUrl = "https://github.com/NixOS/nixpkgs/pull/429225"; # hash = "sha256-cALgj+7eXd3H4WAmW6CIcxWRC3D4PoY2PWNsDxK+G9g=";