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

libglvnd: patch from upstream for libdl

Browse Source
This commit is contained in:
Will Dietz 2018-03-28 13:35:42 -05:00
parent 372b00dfe9
commit 2367250cfb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libglvnd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }:
let let
driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
@ -22,6 +22,13 @@ in stdenv.mkDerivation rec {
"-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
]; ];
# Upstream patch fixing use of libdl, should be in next release.
patches = [
(fetchpatch {
url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch";
sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d";
})
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
passthru = { inherit driverLink; }; passthru = { inherit driverLink; };