From eede7811b4b026c75ce3b2f91ed20bf26019261e Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Wed, 8 Jan 2025 09:49:00 +0000 Subject: [PATCH] uhd: fix for boost187 https://github.com/EttusResearch/uhd/commit/adfe953d965e58b5931c1b1968899492c8087cf6 --- pkgs/applications/radio/uhd/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index c69de023e25fa..6ff0c16a31068 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, + substitute, + fetchpatch, fetchurl, fetchFromGitHub, cmake, @@ -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 ];