Skip to content

Commit

Permalink
uhd: fix for boost187
Browse files Browse the repository at this point in the history
  • Loading branch information
paparodeo authored and bjornfor committed Jan 10, 2025
1 parent f2e88ea commit eede781
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions pkgs/applications/radio/uhd/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
lib,
stdenv,
substitute,
fetchpatch,
fetchurl,
fetchFromGitHub,
cmake,
Expand Down Expand Up @@ -179,6 +181,23 @@ stdenv.mkDerivation (finalAttrs: {
# Build only the host software
preConfigure = "cd host";
patches = [
# fix for boost 187 remove on next update
(substitute {
src = fetchpatch {
name = "boost-187.patch";
url = "https://github.com/EttusResearch/uhd/commit/adfe953d965e58b5931c1b1968899492c8087cf6.patch";
hash = "sha256-qzxe6QhGoyBul7YjCiPJfeP+3dIoo1hh2sjgYmc9IiI=";
};
# The last two hunks in client.cc will fail without these substitutions
substitutions = [
"--replace-fail"
"[buffer, idx, func_name, p, this]"
"[=]"
"--replace-fail"
"[buffer, this]"
"[=]"
];
})
# Disable tests that fail in the sandbox, last checked at version 4.6.0.0
./no-adapter-tests.patch
];
Expand Down

0 comments on commit eede781

Please sign in to comment.