diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index c7bec416c8dd..3bc2fe880b21 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -20,9 +20,11 @@ , tremor # provides 'virbisidec' , libGL , gobject-introspection +, hotdoc , enableX11 ? stdenv.isLinux -, libXv , libXext +, libXi +, libXv , enableWayland ? stdenv.isLinux , wayland , wayland-protocols @@ -41,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.20.3"; + version = "1.22.2"; outputs = [ "out" "dev" ]; @@ -49,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-fjCz3YGnA4D/dVT5mEcdaZb/drvm/FRHCW+FHiRHPJ8="; + hash = "sha256-62USDE7nm3oVPDwZctXAFYwhUYd8xR7Hclu6V0lnnUk="; }; strictDeps = true; @@ -65,9 +67,10 @@ stdenv.mkDerivation (finalAttrs: { orc glib gstreamer - # docs - # TODO add hotdoc here gobject-introspection + + # documentation + hotdoc ] ++ lib.optional enableWayland wayland; buildInputs = [ @@ -91,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib ] ++ lib.optionals enableX11 [ libXext + libXi libXv ] ++ lib.optionals enableWayland [ wayland @@ -104,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users - "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing # 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")}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 80fc921a3679..c764ce738a95 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -8,13 +8,14 @@ , flex , python3 , glib +, hotdoc , makeWrapper , libcap , libunwind -, darwin , elfutils # for libdw , bash-completion , lib +, Cocoa , CoreServices , gobject-introspection , testers @@ -22,22 +23,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.20.3"; + version = "1.22.2"; outputs = [ "bin" "out" "dev" - # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs, see: - # - https://github.com/NixOS/nixpkgs/pull/98767 - # - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551 ]; src = let inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YH2vZLu9X7GK+dF+IcDSLE1wL//oOyPLItGxryyiOio="; + hash = "sha256-sq/nNgOSHGCLpIlp27fXQ3dnRL/l2AWeziQRN7f4jiE="; }; depsBuildBuild = [ @@ -59,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection # documentation - # TODO add hotdoc here + hotdoc ] ++ lib.optionals stdenv.isLinux [ libcap # for setcap binary ]; @@ -72,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { libunwind elfutils ] ++ lib.optionals stdenv.isDarwin [ + Cocoa CoreServices ]; @@ -82,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-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 - "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ] ++ lib.optionals stdenv.isDarwin [ # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. "-Dlibunwind=disabled" diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 0c550ef11641..662c364b9604 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -16,7 +16,7 @@ }: { - gstreamer = callPackage ./core { inherit CoreServices; }; + gstreamer = callPackage ./core { inherit Cocoa CoreServices; }; gstreamermm = callPackage ./gstreamermm { };