soapy{sdr,rtlsdr,uhd}: fix cmake 4 build (#448959)

This commit is contained in:
numinit
2025-10-07 07:07:58 +00:00
committed by GitHub
3 changed files with 23 additions and 8 deletions
+4 -5
View File
@@ -18,16 +18,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "soapysdr";
# Don't forget to change passthru.abiVersion
version = "0.8.1-unstable-2025-03-30-03";
version = "0.8.1-unstable-2025-10-05-03";
src = fetchFromGitHub {
owner = "pothosware";
repo = "SoapySDR";
# Instead of applying several patches for Python 3.12 compat, just take the latest, from:
# use old get python lib for v2 (#437)
rev = "fbf9f3c328868f46029284716df49095ab7b99a6";
hash = "sha256-W4915c6hV/GR5PZRRXZJW3ERsZmQQQ08EA9wYp2tAVk=";
# update to include latest patch for newer cmake support
rev = "1667b4e6301d7ad47b340dcdcd6e9969bf57d843";
hash = "sha256-UCpYBUb2k1bHy1z2Mvmv+1ZX1BloSsPrTydFV3Ga3Os=";
};
nativeBuildInputs = [
+15
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
cmake,
pkg-config,
rtl-sdr,
@@ -28,6 +29,20 @@ stdenv.mkDerivation (finalAttrs: {
soapysdr
];
patches = [
(fetchpatch2 {
name = "cmake-update.patch";
url = "https://github.com/pothosware/SoapyRTLSDR/commit/448c9d0d326c2600905b7ce84222ff9d72ba2189.patch?full_index=1";
hash = "sha256-hWlNowkf9yZM6p+EGh+IiUm2JfG5mLe8Qq8gTVIdIak=";
})
(fetchpatch2 {
name = "fix-cmake4-build.patch";
url = "https://github.com/pothosware/SoapyRTLSDR/commit/bb2d1511b957138051764c9193a3d6971e912b85.patch?full_index=1";
hash = "sha256-C90B5WMjx1lJKiX0F/cAfGmz2WRc2BA84FTmVmnC+DI=";
})
];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
meta = with lib; {
+4 -3
View File
@@ -11,13 +11,14 @@
stdenv.mkDerivation {
pname = "soapyuhd";
version = "0.4.1-unstable-2025-02-13";
version = "0.4.1-unstable-2025-10-05";
src = fetchFromGitHub {
owner = "pothosware";
repo = "SoapyUHD";
rev = "6b521393cc45c66770f3d4bc69eac7dda982174c";
sha256 = "qg0mbw3S973cnok6tVx7Y38ijOQcJdHtPLi889uo7tI=";
# version that supports cmake 4
rev = "cf78b9ca3bddfc9263d2acb7e8afcb0036938163";
hash = "sha256-/hJ78dUL477gX3c2kV8kUknIk01PUf+ie1Gl7Ujq1Ac=";
};
nativeBuildInputs = [