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