Merge pull request #122148 from ryantm/xine-lib

xine-lib: unbreak
This commit is contained in:
Anderson Torres 2021-05-08 11:56:19 -03:00 committed by GitHub
commit 51b9941ba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, aalib , aalib
, alsaLib , alsaLib
, ffmpeg , ffmpeg
@ -16,6 +15,7 @@
, libtheora , libtheora
, libv4l , libv4l
, libvorbis , libvorbis
, ncurses
, perl , perl
, pkg-config , pkg-config
, speex , speex
@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
libtheora libtheora
libv4l libv4l
libvorbis libvorbis
ncurses
perl perl
speex speex
vcdimager vcdimager
@ -64,18 +65,10 @@ stdenv.mkDerivation rec {
libxcb libxcb
]); ]);
patches = [ enableParallelBuilding = true;
# splitting path plugin
(fetchpatch {
name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch";
url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/";
sha256 = "sha256-LJedxrD8JWITDo9pnS9BCmy7wiPTyJyoQ1puX49tOls=";
})
];
NIX_LDFLAGS = "-lxcb-shm"; NIX_LDFLAGS = "-lxcb-shm";
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
homepage = "http://www.xinehq.de/"; homepage = "http://www.xinehq.de/";