From ccc6c1ca888c6a6dc99e6fda30aad827ffd85cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 13 Dec 2025 17:59:25 +0100 Subject: [PATCH] dino: disable optional features per default as they are experimental --- .../instant-messengers/dino/default.nix | 27 ++++++------------- pkgs/top-level/all-packages.nix | 10 +------ 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 54cc0ec5ba81..33aa661cd634 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -27,14 +27,14 @@ srtp, libnice, gnutls, - gstreamer, - gst-plugins-base, - gst-plugins-good, - gst-plugins-bad, - gst-vaapi, + gst_all_1, webrtc-audio-processing, }: +# Upstream is very deliberate about which features are enabled per default or are automatically enabled. +# Everything that is disabled per default has to been seen experimental and should not be enabled without strong reasoning. +# see https://github.com/NixOS/nixpkgs/issues/469614#issuecomment-3649662176 + stdenv.mkDerivation (finalAttrs: { pname = "dino"; version = "0.5.1"; @@ -79,24 +79,13 @@ stdenv.mkDerivation (finalAttrs: { srtp libnice gnutls - gstreamer - gst-plugins-base - gst-plugins-good # contains rtpbin, required for VP9 - gst-plugins-bad # required for H264, MSDK - gst-vaapi # required for VAAPI + gst_all_1.gstreamer + gst_all_1.gst-plugins-base webrtc-audio-processing ]; doCheck = true; - mesonFlags = [ - "-Dplugin-notification-sound=enabled" - "-Dplugin-rtp-h264=enabled" - "-Dplugin-rtp-msdk=enabled" - "-Dplugin-rtp-vaapi=enabled" - "-Dplugin-rtp-vp9=enabled" - ]; - # Undefined symbols for architecture arm64: "_gpg_strerror" NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lgpg-error"; @@ -108,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { # will load # # See https://github.com/dino/dino/wiki/macOS - postFixup = lib.optionalString (stdenv.hostPlatform.isDarwin) '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' cd "$out/lib/dino/plugins/" for f in *.dylib; do mv "$f" "$(basename "$f" .dylib).so" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bcb0283f88f..d1290954c9c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1875,15 +1875,7 @@ with pkgs; asciidoc = asciidoc-full; }; - dino = callPackage ../applications/networking/instant-messengers/dino { - inherit (gst_all_1) - gstreamer - gst-plugins-base - gst-plugins-bad - gst-vaapi - ; - gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; - }; + dino = callPackage ../applications/networking/instant-messengers/dino { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { };