lol

gnuradio: fix build on darwin

+15 -10
+2 -2
pkgs/applications/radio/gnuradio/3.8.nix
··· 271 271 # order to build, see https://github.com/qradiolink/qradiolink/issues/67 272 272 ++ lib.optionals (hasFeature "gr-vocoder") [ 273 273 "-DLIBCODEC2_FOUND=TRUE" 274 - "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" 274 + "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2${stdenv.hostPlatform.extensions.sharedLibrary}" 275 275 "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" 276 276 "-DLIBCODEC2_HAS_FREEDV_API=ON" 277 277 "-DLIBGSM_FOUND=TRUE" 278 - "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" 278 + "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm${stdenv.hostPlatform.extensions.sharedLibrary}" 279 279 "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" 280 280 ] 281 281 ++ lib.optionals (hasFeature "volk" && volk != null) [
+1 -1
pkgs/applications/radio/gnuradio/3.9.nix
··· 296 296 # This is the only python reference worth removing, if needed. 297 297 + lib.optionalString (!hasFeature "python-support") '' 298 298 ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake 299 - ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) 299 + ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) 300 300 ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake 301 301 '' 302 302 ;
+1 -1
pkgs/applications/radio/gnuradio/default.nix
··· 317 317 # This is the only python reference worth removing, if needed. 318 318 + lib.optionalString (!hasFeature "python-support") '' 319 319 ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake 320 - ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) 320 + ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) 321 321 ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake 322 322 '' 323 323 ;
+5 -2
pkgs/applications/radio/gnuradio/shared.nix
··· 84 84 postInstall = "" 85 85 # Gcc references 86 86 + lib.optionalString (hasFeature "gnuradio-runtime") '' 87 - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime.so) 87 + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) 88 + '' 89 + # Clang references in InstalledDir 90 + + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.isDarwin) '' 91 + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) 88 92 '' 89 93 ; 90 94 # NOTE: Outputs are disabled due to upstream not using GNU InstallDIrs cmake ··· 112 116 doCheck = false; 113 117 114 118 meta = with lib; { 115 - broken = stdenv.isDarwin; 116 119 description = "Software Defined Radio (SDR) software"; 117 120 longDescription = '' 118 121 GNU Radio is a free & open-source software development toolkit that
+6 -4
pkgs/applications/radio/gnuradio/wrapper.nix
··· 98 98 "${ 99 99 lib.makeSearchPath 100 100 unwrapped.qt.qtbase.qtPluginPrefix 101 - (builtins.map lib.getBin [ 101 + (builtins.map lib.getBin ([ 102 102 unwrapped.qt.qtbase 103 + ] ++ lib.optionals stdenv.isLinux [ 103 104 unwrapped.qt.qtwayland 104 - ]) 105 + ])) 105 106 }" 106 107 "--prefix" "QML2_IMPORT_PATH" ":" 107 108 "${ 108 109 lib.makeSearchPath 109 110 unwrapped.qt.qtbase.qtQmlPrefix 110 - (builtins.map lib.getBin [ 111 + (builtins.map lib.getBin ([ 111 112 unwrapped.qt.qtbase 113 + ] ++ lib.optionals stdenv.isLinux [ 112 114 unwrapped.qt.qtwayland 113 - ]) 115 + ])) 114 116 }" 115 117 ] 116 118 else