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

Merge pull request #35369 from xeji/epoxy-runpath

Browse Source 
epoxy:  1.3.1 -> 1.5.0, add mesa to libepoxy runpath as fallback
This commit is contained in:
Franz Pletz 2018-03-04 08:11:56 +00:00 committed by GitHub
commit bb8e2731a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,28 +1,33 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python
, mesa, libX11 , mesa_noglu, libX11
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "epoxy-${version}"; name = "epoxy-${version}";
version = "1.3.1"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anholt"; owner = "anholt";
repo = "libepoxy"; repo = "libepoxy";
rev = "v${version}"; rev = "${version}";
sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl"; sha256 = "1ixpqb10pmdy3n9nxd5inflig9dal5502ggadcns5b58j6jr0yv0";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];
buildInputs = [ mesa libX11 ]; buildInputs = [ mesa_noglu libX11 ];
preConfigure = stdenv.lib.optional stdenv.isDarwin '' preConfigure = stdenv.lib.optional stdenv.isDarwin ''
substituteInPlace configure --replace build_glx=no build_glx=yes substituteInPlace configure --replace build_glx=no build_glx=yes
substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
''; '';
# add mesa_nonglu to rpath because libepoxy dlopen()s libEGL
postFixup = ''
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ mesa_noglu ]}:$(patchelf --print-rpath $out/lib/libepoxy.so.0.0.0)" $out/lib/libepoxy.so.0.0.0
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A library for handling OpenGL function pointer management"; description = "A library for handling OpenGL function pointer management";
homepage = https://github.com/anholt/libepoxy; homepage = https://github.com/anholt/libepoxy;