diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-05-01 20:08:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-01 20:08:13 +0200 |
commit | a534c335e0159807d67e217c4ad695dd9e6544fc (patch) | |
tree | 6733279ac008fcf51e7b933ecee123840822884a | |
parent | 6b39739b77c4ab3f39ee3276677ce94af3e2b39c (diff) | |
parent | 08a681689f3c1c5e3960141d5e6ee9689e875802 (diff) |
Merge pull request #307553 from SuperSandro2000/gst-plugins-good-nox
nixos/no-x-libs: disable more GUIs for gst_all_1.gst-plugins-good
-rw-r--r-- | nixos/modules/config/no-x-libs.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gstreamer/good/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index b811823d698a1..1d7976cef36a2 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -47,7 +47,7 @@ with lib; gst_all_1 = super.gst_all_1 // { gst-plugins-bad = super.gst_all_1.gst-plugins-bad.override { guiSupport = false; }; gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableWayland = false; enableX11 = false; }; - gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableX11 = false; }; + gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableWayland = false; enableX11 = false; gtkSupport = false; qt5Support = false; qt6Support = false; }; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index fbb79028bdaf7..19b786a86063c 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -39,6 +39,7 @@ , enableJack ? true, libjack2 , enableX11 ? stdenv.isLinux, xorg , ncurses +, enableWayland ? stdenv.isLinux , wayland , wayland-protocols , libgudev @@ -94,7 +95,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals qt6Support (with qt6; [ qtbase qttools - ]) ++ lib.optionals stdenv.isLinux [ + ]) ++ lib.optionals enableWayland [ wayland-protocols ]; @@ -148,6 +149,7 @@ stdenv.mkDerivation rec { libavc1394 libiec61883 libgudev + ] ++ lib.optionals enableWayland [ wayland ] ++ lib.optionals enableJack [ libjack2 |