JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gstreamer: add patches to fix cross

Browse Source
This commit is contained in:
Robin Gloster 2019-05-06 23:08:13 +02:00
parent 449023497f
commit 8c06639141
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
View File

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -10478,9 +10478,7 @@ in
callPackage = newScope { libav = pkgs.ffmpeg; };
});
gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {
bison = bison2;
};
gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { };
gst-plugins-base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;