diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-17 18:42:59 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-26 14:01:49 +0300 |
| commit | 6467c94c8d2d99c13d594037295722c38e916312 (patch) | |
| tree | af2b8c004cd1d02419cae2d450bc5feb6a64523a | |
| parent | 01b254ec50299f1fe1d3e9a4eb9a002f6fe0c84d (diff) | |
| download | nixlib-6467c94c8d2d99c13d594037295722c38e916312.tar nixlib-6467c94c8d2d99c13d594037295722c38e916312.tar.gz nixlib-6467c94c8d2d99c13d594037295722c38e916312.tar.bz2 nixlib-6467c94c8d2d99c13d594037295722c38e916312.tar.lz nixlib-6467c94c8d2d99c13d594037295722c38e916312.tar.xz nixlib-6467c94c8d2d99c13d594037295722c38e916312.tar.zst nixlib-6467c94c8d2d99c13d594037295722c38e916312.zip | |
libglvnd: 2016-12-22 -> 1.0.0
Move driverLink attribute there.
| -rw-r--r-- | pkgs/development/libraries/libglvnd/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 7ea1ecdd0522..3740fd5569ad 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -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. - -stdenv.mkDerivation rec { - name = "libglvnd-2016-12-22"; +let + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; +in stdenv.mkDerivation rec { + name = "libglvnd-${version}"; + version = "1.0.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; - rev = "dc16f8c337703ad141f83583a4004fcf42e07766"; - sha256 = "1dbwf1216np77xf1kx3ci3y7hfa1p4vgrrzg71gw36hqxf36vg5f"; + rev = "v${version}"; + sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; @@ -17,11 +18,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-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" ]; + passthru = { inherit driverLink; }; + meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; homepage = https://github.com/NVIDIA/libglvnd; |