From e22198417d98dd1a6da0d5a8fd208819dd923012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Dec 2022 02:02:12 +0100 Subject: [PATCH 1/4] zbar: fix enableVideo not fully removing gtk/qt --- pkgs/tools/graphics/zbar/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index d3c4003741e3e..3ddc1678dae16 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -41,8 +41,9 @@ stdenv.mkDerivation rec { xmlto autoreconfHook docbook_xsl - wrapQtAppsHook + ] ++ lib.optionals enableVideo [ wrapGAppsHook + wrapQtAppsHook ]; buildInputs = [ From 4312ffd16a37b560de9275440b51a3e962d1a207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Dec 2022 01:15:20 +0100 Subject: [PATCH 2/4] zbar: add option to disable Xorg --- pkgs/tools/graphics/zbar/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 3ddc1678dae16..4e850e4fe6c70 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 @@ -48,10 +49,11 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagickBig - libX11 libintl ] ++ lib.optionals enableDbus [ dbus + ] ++ lib.optionals withXorg [ + libX11 ] ++ lib.optionals enableVideo [ libv4l gtk3 From d0ffce42bba02f505d2038b13b88e52ade242fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Dec 2022 02:02:31 +0100 Subject: [PATCH 3/4] nixos/no-x-libs: add imagemagick/imagemagickBig --- nixos/modules/config/no-x-libs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 946c9bf38c470..489765261da93 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; }; From de66678a605ee3acb6ab65f9f68fceaab7ed0a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Dec 2022 00:51:58 +0100 Subject: [PATCH 4/4] nixos/no-x-libs: add zbar --- nixos/modules/config/no-x-libs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 489765261da93..1a6c64ef26cc3 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -44,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; }; })); }; }