summary refs log tree commit diff
path: root/nixos/modules/config/no-x-libs.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-12-05 06:01:36 +0000
committerGitHub <noreply@github.com>2022-12-05 06:01:36 +0000
commitd267d265780f1a013585553238970b9483dcbb50 (patch)
treee15cff477e306f85367c7007ee968f5af8c0833c /nixos/modules/config/no-x-libs.nix
parentfe8eef1ae448bf3631c9e5be919c8456da35a006 (diff)
parentbc85ef815830014d9deabb0803d46a78c832f944 (diff)
downloadnixpkgs-d267d265780f1a013585553238970b9483dcbb50.tar
nixpkgs-d267d265780f1a013585553238970b9483dcbb50.tar.gz
nixpkgs-d267d265780f1a013585553238970b9483dcbb50.tar.bz2
nixpkgs-d267d265780f1a013585553238970b9483dcbb50.tar.lz
nixpkgs-d267d265780f1a013585553238970b9483dcbb50.tar.xz
nixpkgs-d267d265780f1a013585553238970b9483dcbb50.tar.zst
nixpkgs-d267d265780f1a013585553238970b9483dcbb50.zip
Merge master into staging-next
Diffstat (limited to 'nixos/modules/config/no-x-libs.nix')
-rw-r--r--nixos/modules/config/no-x-libs.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 4e1d57cc483..18ea1f52a97 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-headless;
       ffmpeg_5 = super.ffmpeg_5-headless;
       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; };
     }));
   };
 }