summary refs log tree commit diff
diff options
context:
space:
mode:
authorTomas Drtina <tdrtina-ext@arista.com>2023-06-07 22:10:42 +0200
committerYt <happysalada@tuta.io>2023-06-20 07:30:17 -0400
commit7adbc86b9ebfd3a369e93cf6f5a49e86bec63833 (patch)
tree6fc168a6c8013a54c6d0d1a730ff2843a8bd5bda
parent21d2bc83c0ac34e4307ac45423cdad5d487588b4 (diff)
downloadnixpkgs-7adbc86b9ebfd3a369e93cf6f5a49e86bec63833.tar
nixpkgs-7adbc86b9ebfd3a369e93cf6f5a49e86bec63833.tar.gz
nixpkgs-7adbc86b9ebfd3a369e93cf6f5a49e86bec63833.tar.bz2
nixpkgs-7adbc86b9ebfd3a369e93cf6f5a49e86bec63833.tar.lz
nixpkgs-7adbc86b9ebfd3a369e93cf6f5a49e86bec63833.tar.xz
nixpkgs-7adbc86b9ebfd3a369e93cf6f5a49e86bec63833.tar.zst
nixpkgs-7adbc86b9ebfd3a369e93cf6f5a49e86bec63833.zip
webrtc-audio-processing: unpin abseil-cpp
-rw-r--r--pkgs/development/libraries/webrtc-audio-processing/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix7
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;