From 7adbc86b9ebfd3a369e93cf6f5a49e86bec63833 Mon Sep 17 00:00:00 2001 From: Tomas Drtina Date: Wed, 7 Jun 2023 22:10:42 +0200 Subject: [PATCH] webrtc-audio-processing: unpin abseil-cpp --- .../libraries/webrtc-audio-processing/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 9a95494558b..f78d8b35e2a 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , darwin -, abseil-cpp_202111 +, abseil-cpp , meson , ninja }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.0"; src = fetchurl { - url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v1.0/webrtc-audio-processing-v${version}.tar.gz"; + url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v${version}/webrtc-audio-processing-v${version}.tar.gz"; sha256 = "sha256-dqRy1OfOG9TX2cgCD8cowU44zVanns/nPYZrilPfuiU="; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - abseil-cpp_202111 + abseil-cpp ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); patchPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54e380544ab..021f5910783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24800,7 +24800,12 @@ with pkgs; websocketpp = callPackage ../development/libraries/websocket++ { }; - webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; }; + webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { + stdenv = gcc10StdenvCompat; + abseil-cpp = abseil-cpp.override { + cxxStandard = "14"; + }; + }; webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; # bump when majoring of packages have updated webrtc-audio-processing = webrtc-audio-processing_0_3;