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

cross: dont disable gui in v4l-utils: its build is fixed in staging; can pull that patch if i want v4l-utils

Browse Source
This commit is contained in:
Colin
2025-08-06 22:12:33 +00:00
parent c4ae9d9e25
commit d64e955206
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hosts/common/programs/assorted.nix
View File

@@ -367,7 +367,7 @@ in
# "tdesktop" # broken on phosh # "tdesktop" # broken on phosh
# "tokodon" # "tokodon"
"tuba" # mastodon/pleroma client (stores pw in keyring) "tuba" # mastodon/pleroma client (stores pw in keyring)
# "v4l-utils" # for `media-ctl`; to debug cameras: <https://wiki.postmarketos.org/wiki/PINE64_PinePhone_(pine64-pinephone)#Cameras> (2025/07/16: disabled because broken cross build) # "v4l-utils" # for `media-ctl`; to debug cameras: <https://wiki.postmarketos.org/wiki/PINE64_PinePhone_(pine64-pinephone)#Cameras>
"video-trimmer" "video-trimmer"
"vulkan-tools" # vulkaninfo "vulkan-tools" # vulkaninfo
# "whalebird" # pleroma client (Electron). input is broken on phosh. # "whalebird" # pleroma client (Electron). input is broken on phosh.
@@ -874,9 +874,9 @@ in
meson = {}; meson = {};
millipixels.packageUnwrapped = pkgs.millipixels.override { # millipixels.packageUnwrapped = pkgs.millipixels.override {
v4l-utils = config.sane.programs.v4l-utils.packageUnwrapped; # necessary for cross compilation # v4l-utils = config.sane.programs.v4l-utils.packageUnwrapped; # necessary for cross compilation
}; # };
millipixels.sandbox.method = null; #< TODO: sandbox millipixels.sandbox.method = null; #< TODO: sandbox
# actual monero blockchain (not wallet/etc; safe to delete, just slow to regenerate) # actual monero blockchain (not wallet/etc; safe to delete, just slow to regenerate)

10
hosts/common/programs/v4l-utils.nix
View File

@@ -10,12 +10,14 @@
# - `v4l2-ctl -d /dev/video1 --all` (front camera?) # - `v4l2-ctl -d /dev/video1 --all` (front camera?)
# - `v4l2-ctl -d /dev/video2 --all` (rear camera?) # - `v4l2-ctl -d /dev/video2 --all` (rear camera?)
# - `v4l2-ctl --list-ctrls-menus -d /dev/video1` (show rotation/flips) # - `v4l2-ctl --list-ctrls-menus -d /dev/video1` (show rotation/flips)
{ pkgs, ... }: { ... }:
{ {
sane.programs.v4l-utils = { sane.programs.v4l-utils = {
packageUnwrapped = pkgs.v4l-utils.override { # packageUnwrapped = pkgs.v4l-utils.override {
withGUI = false; #< XXX(2024-09-09): gui does not cross compile due to qtbase / wrapQtAppsHook # # XXX(2024-09-09): gui does not cross compile due to qtbase / wrapQtAppsHook
}; # # XXX(2025-08-06): v4l-utils cross compiles, thanks to <https://github.com/NixOS/nixpkgs/pull/429900>
# withGUI = false;
# };
sandbox.method = null; #< TODO: sandbox sandbox.method = null; #< TODO: sandbox
}; };
} }

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

@@ -45,6 +45,12 @@ in
# TODO: enable, once i can tolerate a mass rebuild # TODO: enable, once i can tolerate a mass rebuild
# (fetchpatch' { # (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"; # name = "libpcap: enable dbus, rdma, bluetooth features";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/429225"; # prUrl = "https://github.com/NixOS/nixpkgs/pull/429225";
# hash = "sha256-cALgj+7eXd3H4WAmW6CIcxWRC3D4PoY2PWNsDxK+G9g="; # hash = "sha256-cALgj+7eXd3H4WAmW6CIcxWRC3D4PoY2PWNsDxK+G9g=";