diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 946c9bf38c47..1a6c64ef26cc 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -33,6 +33,8 @@ with lib; ffmpeg_4 = super.ffmpeg_4.override { sdlSupport = false; vdpauSupport = false; }; ffmpeg_5 = super.ffmpeg_5.override { sdlSupport = false; vdpauSupport = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; + imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; libva = super.libva-minimal; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; @@ -42,6 +44,7 @@ with lib; networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; + zbar = super.zbar.override { enableVideo = false; withXorg = false; }; })); }; } diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index d3c4003741e3..4e850e4fe6c7 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , imagemagickBig , pkg-config +, withXorg ? true , libX11 , libv4l , qtbase @@ -41,16 +42,18 @@ stdenv.mkDerivation rec { xmlto autoreconfHook docbook_xsl - wrapQtAppsHook + ] ++ lib.optionals enableVideo [ wrapGAppsHook + wrapQtAppsHook ]; buildInputs = [ imagemagickBig - libX11 libintl ] ++ lib.optionals enableDbus [ dbus + ] ++ lib.optionals withXorg [ + libX11 ] ++ lib.optionals enableVideo [ libv4l gtk3