@@ -1,9 +1,7 @@
11{ stdenv
22, lib
33, fetchFromGitHub
4−, fetchpatch
54, cmake
6−, cppunit
75, python3
86, enableModTool ? true
97, removeReferencesTo
@@ -11,25 +9,18 @@
119
1210stdenv.mkDerivation rec {
1311 pname = "volk";
14− version = "2.4.1";
12+ version = "2.5.0";
1513
1614 src = fetchFromGitHub {
1715 owner = "gnuradio";
1816 repo = pname;
1917 rev = "v${version}";
20− sha256 = "fuHJ+p5VN4ThdbQFbzB08VCuy/Zo7m/I1Gs5EQGPeNY=";
18+ sha256 = "XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc=";
2119 fetchSubmodules = true;
2220 };
2321
24− patches = [
25− # Fixes a failing test: https://github.com/gnuradio/volk/pull/434
26− (fetchpatch {
27− url = "https://github.com/gnuradio/volk/pull/434/commits/bce8531b6f1a3c5abe946ed6674b283d54258281.patch";
28− sha256 = "OLW9uF6iL47z63kjvYqwsWtkINav8Xhs+Htqg6Kr4uI=";
29− })
30− ];
3122 cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ];
32− postInstall = ''
23+ postInstall = lib.optionalString (!stdenv.isDarwin) ''
3324 ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
3425 '';
3526