volk: 2.5.0 -> 3.0.0 (for aarch64-darwin only); move to pkgs/by-name
This commit is contained in:
@@ -1,60 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, python3
|
||||
, enableModTool ? true
|
||||
, removeReferencesTo
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "volk";
|
||||
# Version 2.5.1 seems to cause a build issue for aarch64-darwin, see:
|
||||
# https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnuradio";
|
||||
repo = "volk";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff";
|
||||
sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI=";
|
||||
extraPrefix = "";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optionals (!enableModTool) [
|
||||
"-DENABLE_MODTOOL=OFF"
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
# offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
|
||||
# volk_32f_log2_32f: fail on arch neon
|
||||
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (!stdenv.isDarwin) ''
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
python3
|
||||
python3.pkgs.mako
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://libvolk.org/";
|
||||
description = "Vector Optimized Library of Kernels";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -7511,12 +7511,6 @@ with pkgs;
|
||||
|
||||
volctl = callPackage ../tools/audio/volctl { };
|
||||
|
||||
volk = if (stdenv.isDarwin && stdenv.isAarch64) then
|
||||
(callPackage ../development/libraries/volk/2.5.0.nix { })
|
||||
else
|
||||
(callPackage ../development/libraries/volk { })
|
||||
;
|
||||
|
||||
vorta = qt6Packages.callPackage ../applications/backup/vorta { };
|
||||
|
||||
vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };
|
||||
|
||||
Reference in New Issue
Block a user