diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-09 12:30:28 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:11:31 +0000 |
| commit | 55cc63c079f49e81d695a25bc2f5b3902f2bd290 (patch) | |
| tree | e705335d97f50b927c76ccb4a3fbde9fab8372b9 /nixpkgs/pkgs/development/libraries/volk | |
| parent | c26eb6f74d9393127a21eee7a9620a920769f613 (diff) | |
| parent | 87807e64a5ef5206b745a40af118c7be8db73681 (diff) | |
| download | nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.gz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.bz2 nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.lz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.xz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.zst nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.zip | |
Merge commit '87807e64a5ef5206b745a40af118c7be8db73681'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/volk')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/volk/default.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/volk/default.nix b/nixpkgs/pkgs/development/libraries/volk/default.nix index 574a90d22724..40ae88bf71bb 100644 --- a/nixpkgs/pkgs/development/libraries/volk/default.nix +++ b/nixpkgs/pkgs/development/libraries/volk/default.nix @@ -1,9 +1,7 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake -, cppunit , python3 , enableModTool ? true , removeReferencesTo @@ -11,25 +9,18 @@ stdenv.mkDerivation rec { pname = "volk"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "gnuradio"; repo = pname; rev = "v${version}"; - sha256 = "fuHJ+p5VN4ThdbQFbzB08VCuy/Zo7m/I1Gs5EQGPeNY="; + sha256 = "XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; fetchSubmodules = true; }; - patches = [ - # Fixes a failing test: https://github.com/gnuradio/volk/pull/434 - (fetchpatch { - url = "https://github.com/gnuradio/volk/pull/434/commits/bce8531b6f1a3c5abe946ed6674b283d54258281.patch"; - sha256 = "OLW9uF6iL47z63kjvYqwsWtkINav8Xhs+Htqg6Kr4uI="; - }) - ]; cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; - postInstall = '' + postInstall = lib.optionalString (!stdenv.isDarwin) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) ''; |