diff options
| author | Alexander V. Nikolaev <avn@daemon.hole.ru> | 2018-09-25 12:50:51 +0300 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-25 11:50:51 +0200 |
| commit | 867d387a1c92dee533f380e5aeca874b3507de4f (patch) | |
| tree | 2add5e9c28aa2e8c97217f80fcd512cf8815aff7 /pkgs/development | |
| parent | 588b524933a7af27808e1e749e258c3795c9b842 (diff) | |
| download | nixlib-867d387a1c92dee533f380e5aeca874b3507de4f.tar nixlib-867d387a1c92dee533f380e5aeca874b3507de4f.tar.gz nixlib-867d387a1c92dee533f380e5aeca874b3507de4f.tar.bz2 nixlib-867d387a1c92dee533f380e5aeca874b3507de4f.tar.lz nixlib-867d387a1c92dee533f380e5aeca874b3507de4f.tar.xz nixlib-867d387a1c92dee533f380e5aeca874b3507de4f.tar.zst nixlib-867d387a1c92dee533f380e5aeca874b3507de4f.zip | |
epoxy: 1.5.1 -> 1.5.2 (#47178)
libgl-path.patch was updated (it applied with little fuzz, because I am a bit lazy, and rebase it on master of epoxy, not 1.5.2)
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/epoxy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/epoxy/libgl-path.patch | 25 |
2 files changed, 9 insertions, 20 deletions
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index cc62b2776ede..7c3dd19a4795 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "epoxy-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "anholt"; repo = "libepoxy"; rev = "${version}"; - sha256 = "1811agxr7g9wd832np8sw152j468kg3qydmfkc564v54ncfcgaci"; + sha256 = "0frs42s7d3ff2wlw0jns6vb3myx2bhz9m5nkzbnfyn436s2qqls3"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/epoxy/libgl-path.patch index 6f50b9d262b5..8f38ee27174b 100644 --- a/pkgs/development/libraries/epoxy/libgl-path.patch +++ b/pkgs/development/libraries/epoxy/libgl-path.patch @@ -1,20 +1,11 @@ -From 4046e0ac8ed93354c01de5f3b5cae790cce70404 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Thu, 29 Mar 2018 07:21:02 -0500 -Subject: [PATCH] Explicitly search LIBGL_PATH as fallback, if defined. - ---- - src/dispatch_common.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - diff --git a/src/dispatch_common.c b/src/dispatch_common.c -index bc2fb94..776237b 100644 +index b3e4f5f..303e8f5 100644 --- a/src/dispatch_common.c +++ b/src/dispatch_common.c -@@ -306,6 +306,18 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail) - pthread_mutex_lock(&api.mutex); - if (!*handle) { - *handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL); +@@ -310,6 +310,19 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l + flags |= RTLD_NOLOAD; + + *handle = dlopen(lib_name, flags); +#ifdef LIBGL_PATH + if (!*handle) { + char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1]; @@ -24,12 +15,10 @@ index bc2fb94..776237b 100644 + fprintf(stderr, "Error prefixing library pathname\n"); + exit(1); + } -+ *handle = dlopen(pathbuf, RTLD_LAZY | RTLD_LOCAL); ++ *handle = dlopen(pathbuf, flags); + } +#endif ++ if (!*handle) { if (exit_on_fail) { fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror()); --- -2.16.3 - |