gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uhd: 4.8.0.0 -> 4.9.0.0

Browse Source
This commit is contained in:
jakobkukla
2025-09-12 12:12:24 +00:00
parent 3ef96d876c
commit d3dd1afbf7
2 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/uh/uhd/fix-pkg-config.patch
+48
View File
@@ -0,0 +1,48 @@
From 32944bbdbf2c7611e72ec9828464978ca42824ce Mon Sep 17 00:00:00 2001
From: Jakob Kukla <jakob.kukla@gmail.com>
Date: Fri, 12 Sep 2025 10:31:22 +0000
Subject: [PATCH] cmake: support absolute paths for install dirs in pkg-config
The GNUInstallDirs module supports absolute paths for CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR. Some package managers like Nix depend on this behaviour. See https://github.com/NixOS/nixpkgs/issues/144170 for the nixpkgs tracking issue.
---
host/CMakeLists.txt | 12 ++++++++++++
host/uhd.pc.in | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 3e93ea1f0c..4cd0afad9d 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -559,6 +559,18 @@ if(CMAKE_CROSSCOMPILING)
set(UHD_PC_LIBS)
endif(CMAKE_CROSSCOMPILING)
+# Support absolute paths for LIBDIR and INCLUDEDIR
+if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
+ set(UHD_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+else()
+ set(UHD_PC_LIBDIR "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+endif()
+if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
+ set(UHD_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+else()
+ set(UHD_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/uhd.pc.in
${CMAKE_CURRENT_BINARY_DIR}/uhd.pc
diff --git a/host/uhd.pc.in b/host/uhd.pc.in
index 4a5f67c969..f121e2fb70 100644
--- a/host/uhd.pc.in
+++ b/host/uhd.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@UHD_PC_LIBDIR@
+includedir=@UHD_PC_INCLUDEDIR@
Name: @CPACK_PACKAGE_NAME@
Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
pkgs/by-name/uh/uhd/package.nix
+7 -3
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
#
# nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true
#
version = "4.8.0.0";
version = "4.9.0.0";
outputs = [
"out"
@@ -57,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: {
rev = "v${finalAttrs.version}";
# The updateScript relies on the `src` using `hash`, and not `sha256. To
# update the correct hash for the `src` vs the `uhdImagesSrc`
hash = "sha256-1HnXFeja4g1o64IPUkv/YyP/3upgYsjCVWal8t/hcuc=";
hash = "sha256-XA/ADJ0HjD6DxqFTVMwFa7tRgM56mHAEL+a0paWxKyM=";
};
# Firmware images are downloaded (pre-built) from the respective release on Github
uhdImagesSrc = fetchurl {
url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz";
# Please don't convert this to a hash, in base64, see comment near src's
# hash.
sha256 = "0i5zagajj0hzdnavvzaixbn6nkh8p9aqw1lv1bj9lpbdh2wy4bk0";
sha256 = "194gsmvn7gmwj7b1lw9sq0d0y0babbd0q1229qbb3qjc6f6m0p0y";
};
# This are the minimum required Python dependencies, this attribute might
# be useful if you want to build a development environment with a python
@@ -176,6 +176,10 @@ stdenv.mkDerivation (finalAttrs: {
dpdk
];
patches = [
./fix-pkg-config.patch
];
# many tests fails on darwin, according to ofborg
doCheck = !stdenv.hostPlatform.isDarwin;