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

Merge pull request #83129 from ck3d/unstable-vdr-xineliboutput-fix-opengl-and-2.2.0

Browse Source 
vdr-xineliboutput fix build and 2.1.0 -> 2.2.0
This commit is contained in:
markuskowa 2020-03-23 11:13:59 +01:00 committed by GitHub
commit 3578bb5d85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/video/vdr/xineliboutput/default.nix
View File

@ -1,21 +1,26 @@
{ stdenv, fetchurl, lib, vdr { stdenv, fetchurl, lib, vdr
, libav, libcap, libvdpau , libav, libcap, libvdpau
, xineLib, libjpeg, libextractor, mesa, libGLU , xineLib, libjpeg, libextractor, libglvnd, libGLU
, libX11, libXext, libXrender, libXrandr , libX11, libXext, libXrender, libXrandr
, makeWrapper , makeWrapper
}: let }: let
name = "vdr-xineliboutput-2.1.0";
makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l); makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l);
self = stdenv.mkDerivation { self = stdenv.mkDerivation rec {
inherit name; pname = "vdr-xineliboutput";
version = "2.2.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${name}/${name}.tgz"; url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${pname}-${version}/${pname}-${version}.tgz";
sha256 = "1phrxpaz8li7z0qy241spawalhcmwkv5hh3gdijbv4h7mm899yba"; sha256 = "0a24hs5nr7ncf51c5agyfn1xrvb4p70y3i0s6dlyyd9bwbfjldns";
}; };
postPatch = ''
# pkg-config is called with opengl, which do not contain needed glx symbols
substituteInPlace configure \
--replace "X11 opengl" "X11 gl"
'';
# configure don't accept argument --prefix # configure don't accept argument --prefix
dontAddPrefix = true; dontAddPrefix = true;
@ -40,13 +45,13 @@
libcap libcap
libextractor libextractor
libjpeg libjpeg
libglvnd
libGLU libGLU
libvdpau libvdpau
libXext libXext
libXrandr libXrandr
libXrender libXrender
libX11 libX11
mesa
vdr vdr
xineLib xineLib
]; ];