diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-08-25 07:51:38 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-08-25 08:10:37 +0100 |
| commit | 590822ee4f0af03b55bb87b1bd6f967c47aa60ec (patch) | |
| tree | 2066158e23e58947c29ffe644def09c2d41e4a78 /pkgs/development/libraries/ucx | |
| parent | b0f33ebf404d57269773998c301428ba241efd5a (diff) | |
ucx: pull upstream fix for binutils-2.39
`binutils-2.39` dropped `#define PTR void*` compaibility macro.
Without this change build fails as:
debug/debug.c: In function 'load_file':
debug/debug.c:275:53: error: 'PTR' undeclared (first use in this function)
275 | symcount = bfd_read_minisymbols(file->abfd, 0, (PTR)&file->syms, &size);
| ^~~
Diffstat (limited to 'pkgs/development/libraries/ucx')
| -rw-r--r-- | pkgs/development/libraries/ucx/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 4c1728868568c..7a5f57b42299f 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, doxygen , numactl, rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin , enableCuda ? false , cudatoolkit @@ -22,6 +22,16 @@ in stdenv.mkDerivation rec { sha256 = "sha256-DWiOmqxBAAH8DE7H0teoKyp+m3wYEo652ac7ey43Erg="; }; + patches = [ + # Pull upstream fix for binutils-2.39: + # https://github.com/openucx/ucx/pull/8450 + (fetchpatch { + name = "binutils-2.39.patch"; + url = "https://github.com/openucx/ucx/commit/6b6128efd416831cec3a1820f7d1c8e648b79448.patch"; + sha256 = "sha256-ci00nZG8iOUEFXbmgr/5XkIfiw4eAAdG1wcEYjQSiT8="; + }) + ]; + nativeBuildInputs = [ autoreconfHook doxygen ]; buildInputs = [ |