diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-08-30 12:01:35 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-30 12:01:35 +0000 |
commit | d72f9471ada9760c2e106f484bb4491a42eb7020 (patch) | |
tree | 0a0ecf6a931b103d4b45e8e4e4f2d9ece25c6ef9 /pkgs/applications/radio | |
parent | 7651bffac0911a269e496144641292dccbde542d (diff) | |
parent | 70c3bfea5719751840a48a149f22fe356dd7d26b (diff) | |
download | nixlib-d72f9471ada9760c2e106f484bb4491a42eb7020.tar nixlib-d72f9471ada9760c2e106f484bb4491a42eb7020.tar.gz nixlib-d72f9471ada9760c2e106f484bb4491a42eb7020.tar.bz2 nixlib-d72f9471ada9760c2e106f484bb4491a42eb7020.tar.lz nixlib-d72f9471ada9760c2e106f484bb4491a42eb7020.tar.xz nixlib-d72f9471ada9760c2e106f484bb4491a42eb7020.tar.zst nixlib-d72f9471ada9760c2e106f484bb4491a42eb7020.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/radio')
-rw-r--r-- | pkgs/applications/radio/freedv/default.nix | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index df2379b6c704..9e400a11bee5 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -13,6 +13,10 @@ , hamlib , wxGTK31-gtk3 , pulseSupport ? config.pulseaudio or stdenv.isLinux +, AppKit +, AVFoundation +, Cocoa +, CoreMedia }: stdenv.mkDerivation rec { @@ -26,7 +30,15 @@ stdenv.mkDerivation rec { hash = "sha256-LPCY5gPinxJkfPfumKggI/JQorcW+Qw/ZAP6XQmPkeA="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/CMakeLists.txt \ + --replace "if(APPLE)" "if(0)" \ + --replace "\''${FREEDV_LINK_LIBS})" "\''${FREEDV_LINK_LIBS} \''${FREEDV_LINK_LIBS_OSX})" \ + --replace "\''${RES_FILES})" "\''${RES_FILES} \''${FREEDV_SOURCES_OSX})" + ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ codec2 libsamplerate @@ -35,7 +47,13 @@ stdenv.mkDerivation rec { speexdsp hamlib wxGTK31-gtk3 - ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]); + ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]) + ++ lib.optionals stdenv.isDarwin [ + AppKit + AVFoundation + Cocoa + CoreMedia + ]; cmakeFlags = [ "-DUSE_INTERNAL_CODEC2:BOOL=FALSE" @@ -46,8 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; license = licenses.lgpl21; - maintainers = with maintainers; [ mvs ]; + maintainers = with maintainers; [ mvs wegank ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/issues/165422 }; } |