Unverified Commit a534c335 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #307553 from SuperSandro2000/gst-plugins-good-nox 

 nixos/no-x-libs: disable more GUIs for gst_all_1.gst-plugins-good
parents 6b39739b 08a68168

nixos/modules/config/no-x-libs.nix

+1 −1
Original line number Diff line number Diff line
@@ -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; };

pkgs/development/libraries/gstreamer/good/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -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