diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index 287ce2a70084..7b3dfee253de 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -13,13 +13,15 @@ libunwind, pulseaudioSupport ? true, libpulseaudio, + opensslSupport ? true, + openssl, soxSupport ? true, sox }: stdenv.mkDerivation rec { pname = "roc-toolkit"; - version = "0.2.1"; + version = "0.2.3"; outputs = [ "out" "dev" ]; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { owner = "roc-streaming"; repo = "roc-toolkit"; rev = "v${version}"; - sha256 = "sha256-W8PiI5W1T6pNaYzR4u6fPtkP8DKq/Z85Kq/WF5dXVxo="; + hash = "sha256-wwcc2r1hrM9zryMJp+DOifSh0g6T/gdZJMpVdhqhjR8="; }; nativeBuildInputs = [ @@ -43,12 +45,14 @@ stdenv.mkDerivation rec { ] ++ lib.optional openfecSupport openfec ++ lib.optional libunwindSupport libunwind ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional opensslSupport openssl ++ lib.optional soxSupport sox; sconsFlags = [ "--build=${stdenv.buildPlatform.config}" "--host=${stdenv.hostPlatform.config}" "--prefix=${placeholder "out"}" ] ++ + lib.optional (!opensslSupport) "--disable-openssl" ++ lib.optional (!soxSupport) "--disable-sox" ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ @@ -57,13 +61,6 @@ stdenv.mkDerivation rec { else [ "--with-libraries=${openfec}/lib" "--with-openfec-includes=${openfec.dev}/include" ]); - prePatch = lib.optionalString stdenv.isAarch64 - "sed -i 's/c++98/c++11/g' SConstruct"; - - patches = [ - ./fix-pkgconfig-installation.patch - ]; - meta = with lib; { description = "Roc is a toolkit for real-time audio streaming over the network"; homepage = "https://github.com/roc-streaming/roc-toolkit"; diff --git a/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch b/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch deleted file mode 100644 index 8c6982f1f7c1..000000000000 --- a/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/SConscript b/src/SConscript -index b59f67a7..9f16e0a2 100644 ---- a/src/SConscript -+++ b/src/SConscript -@@ -141,7 +141,7 @@ if not GetOption('disable_shared') or GetOption('enable_static') or GetOption('e - desc='Real-time audio streaming over the network.', - url='https://roc-streaming.org', - version=env['ROC_VERSION']) -- env.AddDistFile(env['PKG_CONFIG_PATH'], pc_file) -+ env.AddDistFile(os.path.join(env['ROC_SYSTEM_LIBDIR'], 'pkgconfig'), pc_file) - - if GetOption('enable_examples'): - examples_env = subenvs.examples.Clone() diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c428f0f4ecff..3fb6abe9b56d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11741,9 +11741,7 @@ with pkgs; rmtrash = callPackage ../tools/misc/rmtrash { }; - roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { - scons = sconsPackages.scons_4_1_0; - }; + roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { }; rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { };