diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix index 19ad81f9..ba55c9d0 100644 --- a/hosts/common/programs/default.nix +++ b/hosts/common/programs/default.nix @@ -43,7 +43,6 @@ ./libreoffice.nix ./lemoa.nix ./mako.nix - ./megapixels.nix ./mepo.nix ./mopidy.nix ./mpv.nix diff --git a/hosts/common/programs/megapixels.nix b/hosts/common/programs/megapixels.nix deleted file mode 100644 index 69b9d5e2..00000000 --- a/hosts/common/programs/megapixels.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - sane.programs.megapixels.package = pkgs.megapixels.override { - # megapixels uses zbar to read barcodes. - # zbar by default ships zbarcam-gtk and zbarcam-qt, neither of which megapixels needs. - # but the latter takes a dep on qt, which bloats the closure and the build, so disable this feature. - zbar = pkgs.zbar.override { - enableVideo = false; - }; - }; -} diff --git a/overlays/preferences.nix b/overlays/preferences.nix index 484fdc99..eaff043e 100644 --- a/overlays/preferences.nix +++ b/overlays/preferences.nix @@ -81,4 +81,8 @@ ''; }); }; + + # 2023/12/10: zbar barcode scanner: used by megapixels, frog. + # the video component does not cross compile (qt deps), but i don't need that. + zbar = super.zbar.override { enableVideo = false; }; })