From c2d17dd6facba76ddac713e029eaf13239abe2b6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 6 Jan 2018 22:11:23 -0600 Subject: [PATCH] uhd: apply upstream patch to fix build w/boost 1.66 Fixes #33549. --- pkgs/development/tools/misc/uhd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 8212eccc6d138..a3048a0ecd1b5 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, pkgconfig , python, pythonPackages, orc, libusb1, boost }: # You need these udev rules to not have to run as root (copied from @@ -28,6 +28,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; + patches = [ + # Boost 1.66 compat + (fetchpatch { + url = "https://github.com/EttusResearch/uhd/commit/d9d9d0a8a2e61b1b82e9799585cb7376f581f276.patch"; + sha256 = "0bb7xyq85q591wsjipf1f3rm06zz4pl87xrcmm08xl21hw9avnb5"; + }) + ]; + # Build only the host software preConfigure = "cd host";