diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 1138cd8c1945..cecacc5d1c48 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -15,6 +15,7 @@ , speexdsp , hamlib_4 , wxGTK32 +, sioclient , pulseSupport ? config.pulseaudio or stdenv.isLinux , AppKit , AVFoundation @@ -24,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.9"; + version = "1.8.10.1"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-HDHXVTkXC1fCqj4lnxURmXvQNtwDX4zA6/QFnYceUI4="; + hash = "sha256-m8Myo/5jt+rnV8cAR2p20aAHnbatTkIXGSVhLebAP9g="; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { speexdsp hamlib_4 wxGTK32 + sioclient ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]) ++ lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/development/libraries/sioclient/default.nix b/pkgs/development/libraries/sioclient/default.nix new file mode 100644 index 000000000000..2a4cd3c8e91c --- /dev/null +++ b/pkgs/development/libraries/sioclient/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, asio +, rapidjson +, websocketpp +}: + +stdenv.mkDerivation { + pname = "sioclient"; + version = "unstable-2023-02-13"; + + src = fetchFromGitHub { + owner = "socketio"; + repo = "socket.io-client-cpp"; + rev = "b10474e3eaa6b27e75dbc1382ac9af74fdf3fa85"; + hash = "sha256-bkuFA6AvZvBpnO6Lixqx8Ux5Dy5NHWGB2y1VF7allC0="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + asio + rapidjson + websocketpp + ]; + + meta = with lib; { + description = "C++11 implementation of Socket.IO client"; + homepage = "https://github.com/socketio/socket.io-client-cpp"; + license = licenses.mit; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61b2cc4edbeb..f79c52f2ec74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24078,6 +24078,8 @@ with pkgs; simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_3; }; + sioclient = callPackage ../development/libraries/sioclient { }; + sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; };