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

gnuradio: fix build on darwin

Browse Source
This commit is contained in:
Jiajie Chen 2022-10-25 08:31:44 +08:00
parent 7025406707
commit 4e41708518
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/radio/gnuradio/3.8.nix
View File

@ -271,11 +271,11 @@ stdenv.mkDerivation rec {
# order to build, see https://github.com/qradiolink/qradiolink/issues/67 # order to build, see https://github.com/qradiolink/qradiolink/issues/67
++ lib.optionals (hasFeature "gr-vocoder") [ ++ lib.optionals (hasFeature "gr-vocoder") [
"-DLIBCODEC2_FOUND=TRUE" "-DLIBCODEC2_FOUND=TRUE"
"-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
"-DLIBCODEC2_HAS_FREEDV_API=ON" "-DLIBCODEC2_HAS_FREEDV_API=ON"
"-DLIBGSM_FOUND=TRUE" "-DLIBGSM_FOUND=TRUE"
"-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
] ]
++ lib.optionals (hasFeature "volk" && volk != null) [ ++ lib.optionals (hasFeature "volk" && volk != null) [

2
pkgs/applications/radio/gnuradio/3.9.nix
View File

@ -296,7 +296,7 @@ stdenv.mkDerivation rec {
# This is the only python reference worth removing, if needed. # This is the only python reference worth removing, if needed.
+ lib.optionalString (!hasFeature "python-support") '' + lib.optionalString (!hasFeature "python-support") ''
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary})
${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
'' ''
; ;

2
pkgs/applications/radio/gnuradio/default.nix
View File

@ -317,7 +317,7 @@ stdenv.mkDerivation rec {
# This is the only python reference worth removing, if needed. # This is the only python reference worth removing, if needed.
+ lib.optionalString (!hasFeature "python-support") '' + lib.optionalString (!hasFeature "python-support") ''
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary})
${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
'' ''
; ;

7
pkgs/applications/radio/gnuradio/shared.nix
View File

@ -84,7 +84,11 @@ rec {
postInstall = "" postInstall = ""
# Gcc references # Gcc references
+ lib.optionalString (hasFeature "gnuradio-runtime") '' + lib.optionalString (hasFeature "gnuradio-runtime") ''
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime.so) ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary})
''
# Clang references in InstalledDir
+ lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.isDarwin) ''
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary})
'' ''
; ;
# NOTE: Outputs are disabled due to upstream not using GNU InstallDIrs cmake # NOTE: Outputs are disabled due to upstream not using GNU InstallDIrs cmake
@ -112,7 +116,6 @@ rec {
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {
broken = stdenv.isDarwin;
description = "Software Defined Radio (SDR) software"; description = "Software Defined Radio (SDR) software";
longDescription = '' longDescription = ''
GNU Radio is a free & open-source software development toolkit that GNU Radio is a free & open-source software development toolkit that

10
pkgs/applications/radio/gnuradio/wrapper.nix
View File

@ -98,19 +98,21 @@ let
"${ "${
lib.makeSearchPath lib.makeSearchPath
unwrapped.qt.qtbase.qtPluginPrefix unwrapped.qt.qtbase.qtPluginPrefix
(builtins.map lib.getBin [ (builtins.map lib.getBin ([
unwrapped.qt.qtbase unwrapped.qt.qtbase
] ++ lib.optionals stdenv.isLinux [
unwrapped.qt.qtwayland unwrapped.qt.qtwayland
]) ]))
}" }"
"--prefix" "QML2_IMPORT_PATH" ":" "--prefix" "QML2_IMPORT_PATH" ":"
"${ "${
lib.makeSearchPath lib.makeSearchPath
unwrapped.qt.qtbase.qtQmlPrefix unwrapped.qt.qtbase.qtQmlPrefix
(builtins.map lib.getBin [ (builtins.map lib.getBin ([
unwrapped.qt.qtbase unwrapped.qt.qtbase
] ++ lib.optionals stdenv.isLinux [
unwrapped.qt.qtwayland unwrapped.qt.qtwayland
]) ]))
}" }"
] ]
else else