diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2020-03-23 11:13:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 11:13:59 +0100 |
| commit | 3578bb5d859482403596c87c9bbc17116e438b8c (patch) | |
| tree | 8fff91d96b9066d9eb3ee461642d7bc4d65510c5 | |
| parent | Merge pull request #83198 from Izorkin/netdata-fix (diff) | |
| parent | vdr-xineliboutput: 2.1.0 -> 2.2.0 (diff) | |
| download | nixpkgs-3578bb5d859482403596c87c9bbc17116e438b8c.tar.gz | |
Merge pull request #83129 from ck3d/unstable-vdr-xineliboutput-fix-opengl-and-2.2.0
vdr-xineliboutput fix build and 2.1.0 -> 2.2.0
| -rw-r--r-- | pkgs/applications/video/vdr/xineliboutput/default.nix | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/pkgs/applications/video/vdr/xineliboutput/default.nix index 98fcd2b5d408..950cb253c129 100644 --- a/pkgs/applications/video/vdr/xineliboutput/default.nix +++ b/pkgs/applications/video/vdr/xineliboutput/default.nix @@ -1,21 +1,26 @@ { stdenv, fetchurl, lib, vdr , libav, libcap, libvdpau -, xineLib, libjpeg, libextractor, mesa, libGLU +, xineLib, libjpeg, libextractor, libglvnd, libGLU , libX11, libXext, libXrender, libXrandr , makeWrapper }: let - name = "vdr-xineliboutput-2.1.0"; - makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l); - self = stdenv.mkDerivation { - inherit name; + self = stdenv.mkDerivation rec { + pname = "vdr-xineliboutput"; + version = "2.2.0"; src = fetchurl { - url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${name}/${name}.tgz"; - sha256 = "1phrxpaz8li7z0qy241spawalhcmwkv5hh3gdijbv4h7mm899yba"; + url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${pname}-${version}/${pname}-${version}.tgz"; + 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 dontAddPrefix = true; @@ -40,13 +45,13 @@ libcap libextractor libjpeg + libglvnd libGLU libvdpau libXext libXrandr libXrender libX11 - mesa vdr xineLib ]; |