diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix | 31 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch | 2 |
2 files changed, 15 insertions, 18 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index 9c4f3ee0251d..3ea0bd8903af 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , meson , ninja , pkgconfig @@ -16,34 +15,30 @@ , darwin , elfutils # for libdw , bash-completion -, docbook_xsl -, docbook_xml_dtd_43 -, gtk-doc , lib , CoreServices }: stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.16.2"; + version = "1.18.1"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ + "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 + ]; outputBin = "dev"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73"; + sha256 = "1fpcpsw740svvdxvvwn0hly5i72miizm4s0mbid10ji83zi8vpvr"; }; patches = [ ./fix_pkgconfig_includedir.patch - - # Fix build with bash-completion 2.10 - # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/436 - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/commit/dd2ec3681e2d38e13e01477efa36e851650690fb.patch"; - sha256 = "07hwf67vndsibm1khvs4rfq30sbs9fss8k5vs502xc0kccbi1ih8"; - }) ]; nativeBuildInputs = [ @@ -60,9 +55,7 @@ stdenv.mkDerivation rec { bash-completion # documentation - gtk-doc - docbook_xsl - docbook_xml_dtd_43 + # TODO add hotdoc here ]; buildInputs = [ @@ -82,6 +75,7 @@ stdenv.mkDerivation rec { 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 pkgconfig definitions so meson doesn't detect it. "-Dlibunwind=disabled" @@ -93,7 +87,8 @@ stdenv.mkDerivation rec { gst/parse/get_flex_version.py \ gst/parse/gen_grammar.py.in \ gst/parse/gen_lex.py.in \ - libs/gst/helpers/ptp_helper_post_install.sh + libs/gst/helpers/ptp_helper_post_install.sh \ + scripts/extract-release-date-from-doap-file.py ''; postInstall = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch index c388a82fa2a8..db1684269350 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch @@ -7,8 +7,10 @@ index edb0586c2..7ed46dfce 100644 pkgconf.set('prefix', join_paths(get_option('prefix'))) pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('libexecdir', '${prefix}/@0@'.format(get_option('libexecdir'))) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) +pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) +pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) pkgconf.set('GST_API_VERSION', apiversion) pkgconf.set('VERSION', gst_version) |