diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/development/libraries/gstreamer | |
parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gstreamer')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix | 21 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix | 31 |
2 files changed, 38 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 14e27ab6068c..35c278da03b1 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,14 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }: - -let - ver_maj = "1.10"; - ver_min = "0"; -in +{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1, gnome3 }: stdenv.mkDerivation rec { - name = "gstreamermm-${ver_maj}.${ver_min}"; + pname = "gstreamermm"; + version = "1.10.0"; src = fetchurl { - url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y"; }; @@ -20,9 +16,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; # Unpredictable version stability + }; + }; + meta = with stdenv.lib; { description = "C++ interface for GStreamer"; - homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html; + homepage = "https://gstreamer.freedesktop.org/bindings/cplusplus.html"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index 96c9d8e0c8e1..d03151e43444 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintl }: +{ fetchurl, fetchpatch, stdenv, autoreconfHook +, perl, bison2, flex, pkgconfig, glib, libxml2, libintl +}: stdenv.mkDerivation rec { name = "gstreamer-0.10.36"; @@ -13,12 +15,31 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig libintl ]; - buildInputs = [ perl bison flex ]; + nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison2 glib ]; propagatedBuildInputs = [ glib libxml2 ]; - # See https://trac.macports.org/ticket/40783 for explanation of patch - patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ + (fetchpatch { + url = "https://github.com/GStreamer/common/commit/03a0e5736761a72d4ed880e8c485bbf9e4a8ea47.patch"; + sha256 = "0rin3x01yy78ky3smmhbwlph18hhym18q4x9w6ddiqajg5lk4xhm"; + extraPrefix = "common/"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/GStreamer/common/commit/8aadeaaa8a948d7ce62008789ab03e9aa514c2b9.patch"; + sha256 = "0n2mqvq2al7jr2hflhz4l781i3jya5a9i725jvy508ambpgycz3x"; + extraPrefix = "common/"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/GStreamer/common/commit/7bb2bcecda471a0d514a964365a78150f3ee5747.patch"; + sha256 = "0famdj70m7wjvr1dpy7iywhrkqxmrshxz0rizz1bixgp42dvkhbq"; + extraPrefix = "common/"; + stripLen = 1; + }) + ] ++ + # See https://trac.macports.org/ticket/40783 for explanation of patch + stdenv.lib.optional stdenv.isDarwin ./darwin.patch; postPatch = '' sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in |