From 3028bf5ea303fb04ae29c74b9aea5848e260c668 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Thu, 13 Apr 2023 12:43:12 -0400 Subject: [PATCH] gst_all_1.gst-plugins-good: 1.20.3 -> 1.22.2 --- .../libraries/gstreamer/good/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 1cd9eed123c5..738e43fe42ca 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -31,6 +31,7 @@ , twolame , gtkSupport ? false, gtk3 , qt5Support ? false, qt5 +, qt6Support ? false, qt6 , raspiCameraSupport ? false, libraspberrypi , enableJack ? true, libjack2 , libXdamage @@ -43,19 +44,20 @@ , libgudev , wavpack , glib +, hotdoc }: assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.20.3"; + version = "1.22.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-+PPCBr9c2rwAlTkgtHs1da8O8V6fhxwLaWb20KpYaLc="; + hash = "sha256-fIzFlCXysjL2DKfRPlbt1hXaT3Eec90Bp8/6Rua8DN0="; }; strictDeps = true; @@ -72,8 +74,14 @@ stdenv.mkDerivation rec { orc libshout glib + + # documentation + hotdoc ] ++ lib.optionals qt5Support (with qt5; [ qtbase + ]) ++ lib.optionals qt6Support (with qt6; [ + qtbase + qttools ]) ++ lib.optionals stdenv.isLinux [ wayland-protocols ]; @@ -114,6 +122,10 @@ stdenv.mkDerivation rec { qtdeclarative qtwayland qtx11extras + ]) ++ lib.optionals qt6Support (with qt6; [ + qtbase + qtdeclarative + qtwayland ]) ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optionals stdenv.isLinux [ @@ -129,10 +141,11 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users - "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Dglib-asserts=disabled" # asserts should be disabled on stable releases ] ++ lib.optionals (!qt5Support) [ "-Dqt5=disabled" + ] ++ lib.optionals (!qt6Support) [ + "-Dqt6=disabled" ] ++ lib.optionals (!gtkSupport) [ "-Dgtk3=disabled" ] ++ lib.optionals (!enableJack) [