From ed0ddc3502a45c5764c23ffd8fa2f863c1e97355 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Mar 2025 03:27:34 +0100 Subject: [PATCH] gst_all_1: Disable GLIB_DEBUG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `glib_debug` option (`gobject-cast-checks` prior to 1.26) defaults to `auto`, which would result in the cast checks being disabled on stable versions, if we did not use `-Dauto_features=enabled`. Let’s disable the option as it is meant to be on stable releases: https://gitlab.gnome.org/GNOME/glib/-/blob/main/docs/macros.md#g_enable_debug Also remove option disabling `glib_asserts`. It was introduced in 800ceaf1bdba85525015c967eb9921977a35090a to remove references to `dev` output caused by `__FILE__` used in assertions but they no longer seem to appear. While the option supported the `auto` means disabled on stable versions feature, the option was actually enabled by default, so the comment was incorrect. --- pkgs/development/libraries/gstreamer/bad/default.nix | 2 +- pkgs/development/libraries/gstreamer/base/default.nix | 1 + pkgs/development/libraries/gstreamer/core/default.nix | 1 + pkgs/development/libraries/gstreamer/good/default.nix | 2 +- pkgs/development/libraries/gstreamer/rtsp-server/default.nix | 1 + pkgs/development/libraries/gstreamer/ugly/default.nix | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 3f0ba8bae863..ec47450ab860 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -277,7 +277,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users - "-Dglib_assert=false" # asserts should be disabled on stable releases + "-Dglib_debug=disabled" # cast checks should be disabled on stable releases "-Damfcodec=disabled" # Windows-only "-Dandroidmedia=disabled" # Requires Android system. diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index a6e50190e11a..7deee2e29ee8 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -119,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ + "-Dglib_debug=disabled" # cast checks should be disabled on stable releases "-Dexamples=disabled" # requires many dependencies and probably not useful for our users # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 3077d05725e0..d5a84e2ccbb8 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ + "-Dglib_debug=disabled" # cast checks should be disabled on stable releases "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users (lib.mesonEnable "ptp-helper" withRust) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index ec64497c61b7..d81f85aa9cba 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users - "-Dglib_assert=false" # asserts should be disabled on stable releases + "-Dglib_debug=disabled" # cast checks should be disabled on stable releases (lib.mesonEnable "doc" enableDocumentation) ] ++ lib.optionals (!qt5Support) [ "-Dqt5=disabled" diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 5a53e9a7e609..ce5276cfe6dc 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ + "-Dglib_debug=disabled" # cast checks should be disabled on stable releases "-Dexamples=disabled" # requires many dependencies and probably not useful for our users (lib.mesonEnable "doc" enableDocumentation) ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 7d0684dcdcfd..6c438d6d6198 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ + "-Dglib_debug=disabled" # cast checks should be disabled on stable releases "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing (lib.mesonEnable "doc" enableDocumentation) ] ++ (if enableGplPlugins then [