diff --git a/pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch index 4ff86bfab4be..39b18c15945a 100644 --- a/pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch +++ b/pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch @@ -1,6 +1,8 @@ ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -1233,7 +1233,7 @@ if(NOT VOLKGNSSSDR_FOUND) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 839744f3a..3639bc1c4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1314,7 +1314,7 @@ if(NOT VOLKGNSSSDR_FOUND) BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$:None>$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:NoOptWithASM>$<$:Coverage>$<$:O2WithASM>$<$:O3WithASM>$<$:ASAN> @@ -9,7 +11,16 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1274,7 +1274,7 @@ if(NOT VOLKGNSSSDR_FOUND) +@@ -1324,7 +1324,7 @@ if(NOT VOLKGNSSSDR_FOUND) + else() + if(SUPPORTED_CPU_FEATURES_ARCH) + set(VOLK_GNSSSDR_BUILD_BYPRODUCTS +- ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX} ++ ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX} + ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile + ) + if(ENABLE_CPUFEATURES) +@@ -1355,7 +1355,7 @@ if(NOT VOLKGNSSSDR_FOUND) ) set(VOLK_GNSSSDR_BUILD_BYPRODUCTS ${VOLK_GNSSSDR_BUILD_BYPRODUCTS} @@ -18,7 +29,7 @@ ) endif() endif() -@@ -1287,7 +1287,7 @@ if(NOT VOLKGNSSSDR_FOUND) +@@ -1368,7 +1368,7 @@ if(NOT VOLKGNSSSDR_FOUND) BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$:None>$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:NoOptWithASM>$<$:Coverage>$<$:O2WithASM>$<$:O3WithASM>$<$:ASAN> @@ -27,7 +38,7 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1306,7 +1306,7 @@ if(NOT VOLKGNSSSDR_FOUND) +@@ -1387,12 +1387,12 @@ if(NOT VOLKGNSSSDR_FOUND) BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$:None>$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:NoOptWithASM>$<$:Coverage>$<$:O2WithASM>$<$:O3WithASM>$<$:ASAN> @@ -36,7 +47,31 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1346,7 +1346,7 @@ if(NOT VOLKGNSSSDR_FOUND) + BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} +- BUILD_BYPRODUCTS ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX} ++ BUILD_BYPRODUCTS ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX} + ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile + ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr-config-info + INSTALL_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install +@@ -1406,7 +1406,7 @@ if(NOT VOLKGNSSSDR_FOUND) + endif() + + add_library(volk_gnsssdr UNKNOWN IMPORTED) +- set_property(TARGET volk_gnsssdr PROPERTY IMPORTED_LOCATION ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ set_property(TARGET volk_gnsssdr PROPERTY IMPORTED_LOCATION ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}) + set(VOLK_GNSSSDR_INCLUDE_DIRS "${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build/include/;${GNSSSDR_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include;${ORC_INCLUDE_DIRS}") + set(VOLK_GNSSSDR_LIBRARIES volk_gnsssdr ${ORC_LIBRARIES_STATIC}) + if(CPUFEATURES_FOUND) +@@ -1419,7 +1419,7 @@ if(NOT VOLKGNSSSDR_FOUND) + add_dependencies(Volkgnsssdr::volkgnsssdr volk_gnsssdr_module) + set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" +- IMPORTED_LOCATION "${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}" ++ IMPORTED_LOCATION "${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}" + INCLUDE_DIRECTORIES "${VOLK_GNSSSDR_INCLUDE_DIRS}" + INTERFACE_INCLUDE_DIRECTORIES "${VOLK_GNSSSDR_INCLUDE_DIRS}" + INTERFACE_LINK_LIBRARIES "${VOLK_GNSSSDR_LIBRARIES}" +@@ -1427,7 +1427,7 @@ if(NOT VOLKGNSSSDR_FOUND) if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH) if(NOT CPUFEATURES_FOUND AND ENABLE_CPUFEATURES) set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES diff --git a/pkgs/by-name/gn/gnss-sdr/package.nix b/pkgs/by-name/gn/gnss-sdr/package.nix index e3a242b42d53..318bcae134c9 100644 --- a/pkgs/by-name/gn/gnss-sdr/package.nix +++ b/pkgs/by-name/gn/gnss-sdr/package.nix @@ -23,13 +23,13 @@ gnuradio.pkgs.mkDerivation rec { pname = "gnss-sdr"; - version = "0.0.19.1"; + version = "0.0.20"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "sha256-IbkYdw1pwI+FMnZMChsxMz241Kv4EzMcBb0mm6/jq1k="; + hash = "sha256-kQv8I4dcWeRuAfYtD5EAAMwvfnOTi+QWDogUZb4M/qQ="; }; patches = [ @@ -98,9 +98,12 @@ gnuradio.pkgs.mkDerivation rec { (lib.cmakeBool "ENABLE_UHD" (gnuradio.hasFeature "gr-uhd")) (lib.cmakeBool "ENABLE_FMCOMMS2" (gnuradio.hasFeature "gr-iio" && gnuradio.hasFeature "gr-pdu")) (lib.cmakeBool "ENABLE_PLUTOSDR" (gnuradio.hasFeature "gr-iio")) - (lib.cmakeBool "ENABLE_AD9361" (gnuradio.hasFeature "gr-pdu")) (lib.cmakeBool "ENABLE_UNIT_TESTING" false) + # Requires unpackaged gnsstk + # Only relevant if you want to run gnss-sdr on FPGA SoCs like Zynq + # (lib.cmakeBool "ENABLE_AD9361" (gnuradio.hasFeature "gr-pdu")) + # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as # armadillo is built using both, so skip checking for them. (lib.cmakeFeature "BLAS_LIBRARIES" "-lblas")