From 7e945690180c4624101cdc7e205c9190c8fc92b5 Mon Sep 17 00:00:00 2001 From: Jo-Blade Date: Sun, 8 Dec 2024 00:37:28 +0100 Subject: [PATCH] gnome-decoder : 0.4.1 -> 0.6.1 --- .../graphics/gnome-decoder/default.nix | 20 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index c105ba1fad0a..cc4661111bb9 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -17,29 +17,41 @@ , gstreamer , gst-plugins-base , gst-plugins-bad +, gst-plugins-good +, gst-plugins-rs , wrapGAppsHook4 , appstream-glib , desktop-file-utils +, glycin-loaders }: clangStdenv.mkDerivation rec { pname = "gnome-decoder"; - version = "0.4.1"; + version = "0.6.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "decoder"; rev = version; - hash = "sha256-ZEt4QaT2w7PgsnwBCYeDbhcYX0yd0boes/LoejQx0XU="; + hash = "sha256-qSPuEVW+FwC9OJa+dseIy4/2bhVdTryJSJNSpes9tpY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-acYOSPSUgm0Kg/bo2WF4sRWfCt03AZdTyNNt3Qv7Zjg="; + hash = "sha256-MbfukvqlzZPnWNtWCwYn7lABqBxtZWvPDba9Deah+w8="; }; + preFixup = '' + gappsWrapperArgs+=( + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst-plugins-good}/share/gstreamer-1.0/presets" + # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + ) + ''; + nativeBuildInputs = [ meson ninja @@ -64,6 +76,8 @@ clangStdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad + gst-plugins-good + gst-plugins-rs # for gtk4paintablesink ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e234d8ca810..2373794c77df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3514,7 +3514,7 @@ with pkgs; }; gnome-decoder = callPackage ../applications/graphics/gnome-decoder { - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-rs; gst-plugins-bad = gst_all_1.gst-plugins-bad.override { enableZbar = true; }; };