Merge pull request #128494 from eduardosm/volk

authored by

Maciej Krüger and committed by
GitHub
a7776f95 3a8d7958

+3 -12
+3 -12
pkgs/development/libraries/volk/default.nix
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 - , fetchpatch 5 , cmake 6 - , cppunit 7 , python3 8 , enableModTool ? true 9 , removeReferencesTo ··· 11 12 stdenv.mkDerivation rec { 13 pname = "volk"; 14 - version = "2.4.1"; 15 16 src = fetchFromGitHub { 17 owner = "gnuradio"; 18 repo = pname; 19 rev = "v${version}"; 20 - sha256 = "fuHJ+p5VN4ThdbQFbzB08VCuy/Zo7m/I1Gs5EQGPeNY="; 21 fetchSubmodules = true; 22 }; 23 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 - ]; 31 cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; 32 - postInstall = '' 33 ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) 34 ''; 35
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 , cmake 5 , python3 6 , enableModTool ? true 7 , removeReferencesTo ··· 9 10 stdenv.mkDerivation rec { 11 pname = "volk"; 12 + version = "2.5.0"; 13 14 src = fetchFromGitHub { 15 owner = "gnuradio"; 16 repo = pname; 17 rev = "v${version}"; 18 + sha256 = "XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; 19 fetchSubmodules = true; 20 }; 21 22 cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; 23 + postInstall = lib.optionalString (!stdenv.isDarwin) '' 24 ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) 25 ''; 26