diff options
| author | Christian Kögler <christian.koegler@esg.de> | 2020-03-22 11:38:28 +0100 |
|---|---|---|
| committer | Markus Kowalewski <markus.kowalewski@gmail.com> | 2020-03-23 11:17:41 +0100 |
| commit | 2762ade637eda14771e0324006431bb1e8181d47 (patch) | |
| tree | 7a8595c2d44cf4b9678361f2c0c3d690fd7db7dd /pkgs | |
| parent | 67e523c51983b564b09e3d2bde0510271f22657b (diff) | |
vdr-xinelinboutput: fix pkg-config for opengl
Up to including nixos-19.09 configure fall back and included right libraries. Since nixos-20.03 pkg-config returns a valid value for opengl, but opengl misses glx symbols. (cherry picked from commit d315b3d26777b08d120a8a1d5292ce2703d86864)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/vdr/xineliboutput/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/pkgs/applications/video/vdr/xineliboutput/default.nix index 98fcd2b5d4082..fd6ef250de6ac 100644 --- a/pkgs/applications/video/vdr/xineliboutput/default.nix +++ b/pkgs/applications/video/vdr/xineliboutput/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, vdr , libav, libcap, libvdpau -, xineLib, libjpeg, libextractor, mesa, libGLU +, xineLib, libjpeg, libextractor, libglvnd, libGLU , libX11, libXext, libXrender, libXrandr , makeWrapper }: let @@ -16,6 +16,12 @@ sha256 = "1phrxpaz8li7z0qy241spawalhcmwkv5hh3gdijbv4h7mm899yba"; }; + 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 +46,13 @@ libcap libextractor libjpeg + libglvnd libGLU libvdpau libXext libXrandr libXrender libX11 - mesa vdr xineLib ]; |