From 361dfd3fbaed47ca961d49ae639242cfcc71ecb2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 16 Mar 2025 01:12:13 +0000 Subject: [PATCH] =?UTF-8?q?gst=5Fall=5F1.gstreamer:=201.24.10=20=E2=86=92?= =?UTF-8?q?=201.26.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update https://gstreamer.freedesktop.org/releases/1.26/ - Format expression - Use `finalAttrs` pattern - Add `updateScript` --- .../libraries/gstreamer/core/default.nix | 86 ++++++++++--------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 7cedd95ad451..3077d05725e0 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -1,35 +1,40 @@ -{ stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gettext -, bison -, flex -, python3 -, glib -, makeWrapper -, libcap -, elfutils # for libdw -, bash-completion -, lib -, Cocoa -, CoreServices -, xpc -, testers -, rustc -, withRust ? - lib.any (lib.meta.platformMatch stdenv.hostPlatform) rustc.targetPlatforms && - lib.all (p: !lib.meta.platformMatch stdenv.hostPlatform p) rustc.badTargetPlatforms -, gobject-introspection -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, libunwind -, withLibunwind ? - lib.meta.availableOn stdenv.hostPlatform libunwind && - lib.elem "libunwind" libunwind.meta.pkgConfigModules or [] -# Checks meson.is_cross_build(), so even canExecute isn't enough. -, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc +{ + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + gettext, + bison, + flex, + python3, + glib, + makeWrapper, + libcap, + elfutils, # for libdw + bash-completion, + lib, + Cocoa, + CoreServices, + xpc, + testers, + rustc, + withRust ? + lib.any (lib.meta.platformMatch stdenv.hostPlatform) rustc.targetPlatforms + && lib.all (p: !lib.meta.platformMatch stdenv.hostPlatform p) rustc.badTargetPlatforms, + gobject-introspection, + buildPackages, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + libunwind, + withLibunwind ? + lib.meta.availableOn stdenv.hostPlatform libunwind + && lib.elem "libunwind" libunwind.meta.pkgConfigModules or [ ], + # Checks meson.is_cross_build(), so even canExecute isn't enough. + enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, + hotdoc, + directoryListingUpdater, }: let @@ -37,7 +42,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.24.10"; + version = "1.26.0"; outputs = [ "bin" @@ -47,11 +52,9 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; - src = let - inherit (finalAttrs) pname version; - in fetchurl { - url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-n8RbGjMuj4EvCelcKBzXWWn20WgtBiqBXbDnvAR1GP0="; + src = fetchurl { + url = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${finalAttrs.version}.tar.xz"; + hash = "sha256-Gy7kAoAQwlt3bv+nw5bH4+GGG2C5QX5Bb0kUq83/J58="; }; depsBuildBuild = [ @@ -131,7 +134,12 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru = { + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + updateScript = directoryListingUpdater { }; + }; meta = with lib; { description = "Open source multimedia framework";