diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-05 06:01:36 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-05 06:01:36 +0000 |
commit | d267d265780f1a013585553238970b9483dcbb50 (patch) | |
tree | e15cff477e306f85367c7007ee968f5af8c0833c /nixos/modules/config | |
parent | fe8eef1ae448bf3631c9e5be919c8456da35a006 (diff) | |
parent | bc85ef815830014d9deabb0803d46a78c832f944 (diff) |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/no-x-libs.nix | 3 |
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 4e1d57cc48353..18ea1f52a9766 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; }; })); }; } |