diff options
| author | Will Dietz <github@wdtz.org> | 2018-03-31 00:39:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 00:39:25 -0500 |
| commit | 6096a4de4895d5e5bcb866fb45606a307d4e13ac (patch) | |
| tree | fcea45337a80e0fffbb53da42c6c0f509a31b600 | |
| parent | 372b00dfe9846deca733306c11720553d8d43755 (diff) | |
| parent | 2367250cfb8debb11389a742865acc85fee486b1 (diff) | |
| download | nixpkgs-6096a4de4895d5e5bcb866fb45606a307d4e13ac.tar nixpkgs-6096a4de4895d5e5bcb866fb45606a307d4e13ac.tar.gz nixpkgs-6096a4de4895d5e5bcb866fb45606a307d4e13ac.tar.bz2 nixpkgs-6096a4de4895d5e5bcb866fb45606a307d4e13ac.tar.lz nixpkgs-6096a4de4895d5e5bcb866fb45606a307d4e13ac.tar.xz nixpkgs-6096a4de4895d5e5bcb866fb45606a307d4e13ac.tar.zst nixpkgs-6096a4de4895d5e5bcb866fb45606a307d4e13ac.zip | |
Merge pull request #38170 from dtzWill/fix/libglvnd-libdl-from-upstream
libglvnd: patch from upstream for libdl
| -rw-r--r-- | pkgs/development/libraries/libglvnd/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 3740fd5569a..4bc1d1addcf 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: let 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\"" ]; + # 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" ]; passthru = { inherit driverLink; }; |