diff options
author | Niklas Hambüchen <mail@nh2.me> | 2020-10-29 14:04:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-29 14:04:16 +0100 |
commit | e5b345c09d0cfaa11c27125801e4dab7cea493de (patch) | |
tree | 66b39b8b235cef11d947c7a78b41d1827309eb3e /pkgs/development/libraries/gstreamer/base | |
parent | 0b32140b34485eaa03a68e51b9d5aebc6bcce1fa (diff) | |
parent | 38c52994a6334fb37b9009a638b1e5904ca4cb7f (diff) |
Merge pull request #99345 from nh2/gstreamer-1.18.0
gstreamer: 1.16.2 -> 1.18.0
Diffstat (limited to 'pkgs/development/libraries/gstreamer/base')
-rw-r--r-- | pkgs/development/libraries/gstreamer/base/default.nix | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 79405e5077e03..00f3ecd449d1b 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -19,9 +19,6 @@ , libvisual , tremor # provides 'virbisidec' , libGL -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 , enableX11 ? stdenv.isLinux , libXv , enableWayland ? stdenv.isLinux @@ -42,13 +39,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.16.2"; + version = "1.18.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi"; + sha256 = "15vqvcy842vhbic3w7l4yvannzazdgwggzv2x8f9m02hm78vsakn"; }; patches = [ @@ -66,9 +63,7 @@ stdenv.mkDerivation rec { gobject-introspection # docs - gtk-doc - docbook_xsl - docbook_xml_dtd_43 + # TODO add hotdoc here ] ++ lib.optional enableWayland wayland; buildInputs = [ @@ -103,17 +98,10 @@ 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 "-Dgl-graphene=disabled" # 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")}" - # We must currently disable gtk_doc API docs generation, - # because it is not compatible with some features being disabled. - # See for example - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/564 - # for it failing because some Wayland symbols are missing. - # This problem appeared between 1.15.1 and 1.16.0. - # In 1.18 they should switch to hotdoc, which should make this issue irrelevant. - "-Dgtk_doc=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" # TODO How to disable Wayland? @@ -125,7 +113,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs common/scangobj-merge.py + patchShebangs \ + common/scangobj-merge.py \ + scripts/extract-release-date-from-doap-file.py ''; # This package has some `_("string literal")` string formats |