diff options
Diffstat (limited to 'pkgs/development/libraries/libglvnd/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libglvnd/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index c7b76497fa8..62c6b45c5d4 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,8 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: -let - driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "libglvnd-${version}"; version = "1.0.0"; @@ -13,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -26,7 +24,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" # 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\"" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" ] ++ lib.optional stdenv.cc.isClang "-Wno-error"; # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 @@ -45,7 +43,13 @@ in stdenv.mkDerivation rec { }); outputs = [ "out" "dev" ]; - passthru = { inherit driverLink; }; + # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/libGLX.so $out/lib/libEGL.so + ''; + + passthru = { inherit (addOpenGLRunpath) driverLink; }; meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; |