about summary refs log tree commit diff
path: root/pkgs/applications/radio/uhd
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2023-04-17 19:27:27 +0300
committerDoron Behar <doron.behar@gmail.com>2023-04-17 21:19:57 +0300
commit3697ccb4b1444c1cd4259da5bb875308b091488b (patch)
tree26025b423761326d5c171f0e997045b5ad9e6c89 /pkgs/applications/radio/uhd
parent9c8a86d52f66d64cb5d268398fd5269a3cbb024b (diff)
uhd: Remove neon.patch not applying anymore
Diffstat (limited to 'pkgs/applications/radio/uhd')
-rw-r--r--pkgs/applications/radio/uhd/default.nix2
-rw-r--r--pkgs/applications/radio/uhd/neon.patch19
2 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix
index b810af6e2ea6f..678236ebbefef 100644
--- a/pkgs/applications/radio/uhd/default.nix
+++ b/pkgs/applications/radio/uhd/default.nix
@@ -121,8 +121,6 @@ stdenv.mkDerivation rec {
   patches = [
     # Disable tests that fail in the sandbox
     ./no-adapter-tests.patch
-  ] ++ lib.optionals stdenv.isAarch32 [
-    ./neon.patch
   ];
 
   postPhases = [ "installFirmware" "removeInstalledTests" ]
diff --git a/pkgs/applications/radio/uhd/neon.patch b/pkgs/applications/radio/uhd/neon.patch
deleted file mode 100644
index 18ec59c1d64be..0000000000000
--- a/pkgs/applications/radio/uhd/neon.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: When building for armhf, enable NEON
- NEON is part of the armhf baseline, so this will always be enabled on
- armhf.
-Author: Paul Tagliamonte <paultag@debian.org>
-Bug-Debian: https://bugs.debian.org/873608
-Origin: vendor
-Last-Update: 2017-08-29
-
---- uhd-3.10.2.0.orig/host/lib/convert/CMakeLists.txt
-+++ uhd-3.10.2.0/host/lib/convert/CMakeLists.txt
-@@ -67,6 +67,8 @@ IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_V
-         ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
-         ${CMAKE_CURRENT_SOURCE_DIR}/convert_neon.S
-     )
-+
-+    SET ( CMAKE_CXX_FLAGS "-mfpu=neon" )
- ENDIF()
- 
- ########################################################################