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

libglvnd: 2016-12-22 -> 1.0.0

Browse Source 
Move driverLink attribute there.
This commit is contained in:
Nikolay Amiantov 2018-03-17 18:42:59 +03:00
parent 01b254ec50
commit 6467c94c8d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,16 @@
{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libGL_driver, libX11, libXext, glproto }: { stdenv, lib, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }:
# Git version is needed for EGL and GLES handling. let
driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "libglvnd-2016-12-22"; name = "libglvnd-${version}";
version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NVIDIA"; owner = "NVIDIA";
repo = "libglvnd"; repo = "libglvnd";
rev = "dc16f8c337703ad141f83583a4004fcf42e07766"; rev = "v${version}";
sha256 = "1dbwf1216np77xf1kx3ci3y7hfa1p4vgrrzg71gw36hqxf36vg5f"; sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; nativeBuildInputs = [ autoreconfHook pkgconfig python2 ];
@ -17,11 +18,14 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
"-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS"
"-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${libGL_driver.driverLink}/share/glvnd/egl_vendor.d\"" # FHS paths are added so that non-NixOS applications can find vendor files.
"-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
passthru = { inherit driverLink; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The GL Vendor-Neutral Dispatch library"; description = "The GL Vendor-Neutral Dispatch library";
homepage = https://github.com/NVIDIA/libglvnd; homepage = https://github.com/NVIDIA/libglvnd;