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

Merge pull request #314428 from SuperSandro2000/nox-gst

parents f37d2a28 7e492aff

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

+2 −1
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ with lib; 
      graphviz = super.graphviz-nox;

      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-base = super.gst_all_1.gst-plugins-base.override { enableGl = false; enableWayland = false; enableX11 = false; };

        gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableWayland = false; enableX11 = false; gtkSupport = false; qt5Support = false; qt6Support = false; };

        gst-plugins-rs = super.gst_all_1.gst-plugins-rs.override { withGtkPlugins = false; };

      };

      imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };

      imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };

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

+5 −4
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec { 
    gobject-introspection

  ] ++ lib.optionals enableDocumentation [

    hotdoc

  ] ++ lib.optionals stdenv.isLinux [

  ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [

    wayland # for wayland-scanner

  ];
@@ -211,7 +211,7 @@ stdenv.mkDerivation rec { 
    bluez

  ] ++ lib.optionals microdnsSupport [

    libmicrodns

  ] ++ lib.optionals stdenv.isLinux [

  ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [

    libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs

    wayland

    wayland-protocols
@@ -305,6 +305,7 @@ stdenv.mkDerivation rec { 
  ++ lib.optionals (!stdenv.isLinux) [

    "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only

    "-Dnvcodec=disabled" # Linux-only

  ] ++ lib.optionals (!stdenv.isLinux || !gst-plugins-base.waylandEnabled) [

    "-Dva=disabled" # see comment on `libva` in `buildInputs`

  ] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [

    "-Ddirectfb=disabled"
@@ -322,8 +323,8 @@ stdenv.mkDerivation rec { 
    "-Duvch264=disabled" # requires gudev

    "-Dv4l2codecs=disabled" # requires gudev

    "-Dladspa=disabled" # requires lrdf

  ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64) [

    "-Dqsv=disabled" # Linux (and Windows) x86 only

  ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64 || !gst-plugins-base.waylandEnabled) [

    "-Dqsv=disabled" # Linux (and Windows) x86 only, makes va required

  ] ++ lib.optionals (!gst-plugins-base.glEnabled) [

    "-Dgl=disabled"

  ] ++ lib.optionals (!gst-plugins-base.waylandEnabled || !guiSupport) [

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

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
, nix-update-script

# specifies a limited subset of plugins to build (the default `null` means all plugins supported on the stdenv platform)

, plugins ? null

, withGtkPlugins ? true

# Checks meson.is_cross_build(), so even canExecute isn't enough.

, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null

, hotdoc
@@ -114,7 +115,7 @@ let 
      "reqwest" # tests hang on darwin

      "threadshare" # tests cannot bind to localhost on darwin

      "webp" # not supported on darwin (upstream crate issue)

    ] ++ lib.optionals (!gst-plugins-base.glEnabled) [

    ] ++ lib.optionals (!gst-plugins-base.glEnabled || !withGtkPlugins) [

      # these require gstreamer-gl

      "gtk4"

      "livesync"