JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #221433 from TravisWhitaker/gnuradio-darwin-aarch64

Browse Source 
gnuradio: fix on darwin-aarch64
This commit is contained in:
Weijia Wang 2023-03-16 22:50:21 +02:00 committed by GitHub
commit e5665ccebf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/radio/uhd/default.nix
View File

@ -6,6 +6,7 @@
, pkg-config
# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations
, boost
, ncurses
, enableCApi ? true
# requires numpy
, enablePythonApi ? false
@ -105,6 +106,7 @@ stdenv.mkDerivation rec {
# However, if enableLibuhd_Python_api *or* enableUtils is on, we need
# pythonEnv for runtime as well. The utilities' runtime dependencies are
# handled at the environment
++ optionals (enableExamples) [ ncurses ncurses.dev ]
++ optionals (enablePythonApi || enableUtils) [ pythonEnv ]
++ optionals (enableDpdk) [ dpdk ]
;
@ -124,7 +126,7 @@ stdenv.mkDerivation rec {
];
postPhases = [ "installFirmware" "removeInstalledTests" ]
++ optionals (enableUtils) [ "moveUdevRules" ]
++ optionals (enableUtils && stdenv.targetPlatform.isLinux) [ "moveUdevRules" ]
;
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`

3
pkgs/development/libraries/volk/2.5.0.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
owner = "gnuradio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg=";
sha256 = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc=";
fetchSubmodules = true;
};
@ -58,4 +58,3 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
};
}