diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/development/libraries/gstreamer/core | |
parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gstreamer/core')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index b69ab89df24d..fa838d5ff773 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -2,12 +2,17 @@ , pkgconfig, gettext, gobject-introspection , bison, flex, python3, glib, makeWrapper , libcap,libunwind, darwin +, elfutils # for libdw +, bash-completion +, docbook_xsl, docbook_xml_dtd_412 +, gtk-doc , lib +, CoreServices }: stdenv.mkDerivation rec { name = "gstreamer-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = with lib ;{ description = "Open source multimedia framework"; @@ -19,14 +24,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "1izzhnlsy83rgr4zl3jcl1sryxqbbigrrqw3j4x3nnphqnb6ckzr"; + sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"; }; patches = [ - (fetchpatch { - url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370411"; - sha256 = "16plzzmkk906k4892zq68j3c9z8vdma5nxzlviq20jfv04ykhmk2"; - }) ./fix_pkgconfig_includedir.patch ]; @@ -35,13 +36,27 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext bison flex python3 makeWrapper gobject-introspection + bash-completion + gtk-doc + # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` + docbook_xsl docbook_xml_dtd_412 ]; + buildInputs = - lib.optionals stdenv.isLinux [ libcap libunwind ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; + lib.optionals stdenv.isLinux [ libcap libunwind elfutils ] + ++ lib.optional stdenv.isDarwin CoreServices; propagatedBuildInputs = [ glib ]; + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + "-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 + ] + # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. + ++ stdenv.lib.optionals stdenv.isDarwin [ "-Dlibunwind=disabled" "-Dlibdw=disabled" ]; + postInstall = '' for prog in "$dev/bin/"*; do # We can't use --suffix here due to quoting so we craft the export command by hand @@ -49,9 +64,17 @@ stdenv.mkDerivation rec { done ''; - preConfigure= '' - patchShebangs . - ''; + preConfigure= + # These files are not executable upstream, so we need to + # make them executable for `patchShebangs` to pick them up. + # Can be removed when this is merged and available: + # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/141 + '' + chmod +x gst/parse/get_flex_version.py + '' + + '' + patchShebangs . + ''; preFixup = '' moveToOutput "share/bash-completion" "$dev" |