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

libglvnd: 1.0.0 -> 1.2.0

This commit is contained in:
Edmund Wu 2019-10-02 10:18:58 -04:00 committed by Frederik Rietdijk
parent 7f69e4f2e8
commit 2d1a119ff8
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libglvnd"; pname = "libglvnd";
version = "1.0.0"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NVIDIA"; owner = "NVIDIA";
repo = "libglvnd"; repo = "libglvnd";
rev = "v${version}"; rev = "v${version}";
sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ]; nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ];
@ -32,17 +32,6 @@ stdenv.mkDerivation rec {
# Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268
configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls";
# Upstream patch fixing use of libdl, should be in next release.
patches = [
(fetchpatch {
url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch";
sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d";
})
] ++ stdenv.lib.optional stdenv.isDarwin
(fetchpatch {
url = "https://github.com/NVIDIA/libglvnd/commit/294ccb2f49107432567e116e13efac586580a4cc.patch";
sha256 = "01339wg27cypv93221rhk3885vxbsg8kvbfyia77jmjdcnwrdwm2";
});
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
# Set RUNPATH so that libGLX can find driver libraries in /run/opengl-driver(-32)/lib. # Set RUNPATH so that libGLX can find driver libraries in /run/opengl-driver(-32)/lib.