diff --git a/pkgs/by-name/vo/volk/package.nix b/pkgs/by-name/vo/volk/package.nix index caf3c848a1ed..488b4e286419 100644 --- a/pkgs/by-name/vo/volk/package.nix +++ b/pkgs/by-name/vo/volk/package.nix @@ -5,41 +5,31 @@ , cmake , python3 , enableModTool ? true -, removeReferencesTo }: stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "3.0.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "gnuradio"; repo = "volk"; rev = "v${finalAttrs.version}"; - hash = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg="; + hash = "sha256-R1FT5sbl0fAAl6YIX5aD5CiQ/AjZkCSDPPQPiuy4WBY="; fetchSubmodules = true; }; patches = [ - # Remove a failing test + # https://github.com/gnuradio/volk/pull/766 (fetchpatch { - url = "https://github.com/gnuradio/volk/commit/fe2e4a73480bf2ac2e566052ea682817dddaf61f.patch"; - hash = "sha256-Vko/Plk7u6UAr32lieU+T9G34Dkg9EW3Noi/NArpRL4="; + url = "https://github.com/gnuradio/volk/commit/e46771a739658b5483c25ee1203587bf07468c4d.patch"; + hash = "sha256-33V6lA4Ch50o2E7HPUMQ2NPqHXx/i6FUbz3vIaQa9Wc="; }) ]; - cmakeFlags = lib.optionals (!enableModTool) [ - "-DENABLE_MODTOOL=OFF" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "-DVOLK_CPU_FEATURES=OFF" - # offset 17912 in1: -0.0366274 in2: -0.0366173 tolerance was: 1e-05 - # volk_32f_log2_32f: fail on arch neon - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" + cmakeFlags = [ + (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) - ''; - nativeBuildInputs = [ cmake python3