summary refs log tree commit diff
path: root/pkgs/applications/networking/p2p
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2023-09-10 10:30:42 +0000
committerGitHub <noreply@github.com>2023-09-10 10:30:42 +0000
commit2fa96bfc08a1150ad148bedb62ab11e928c9446e (patch)
tree8eee6ce9567ce4a346fb9098fbb2030a9cb65fd3 /pkgs/applications/networking/p2p
parent13f3a8c681614cb35b9011956fc559b1d9bbf459 (diff)
parent142cb83c7327a7dc66c174491a23cb6e71f24fdb (diff)
downloadnixpkgs-2fa96bfc08a1150ad148bedb62ab11e928c9446e.tar
nixpkgs-2fa96bfc08a1150ad148bedb62ab11e928c9446e.tar.gz
nixpkgs-2fa96bfc08a1150ad148bedb62ab11e928c9446e.tar.bz2
nixpkgs-2fa96bfc08a1150ad148bedb62ab11e928c9446e.tar.lz
nixpkgs-2fa96bfc08a1150ad148bedb62ab11e928c9446e.tar.xz
nixpkgs-2fa96bfc08a1150ad148bedb62ab11e928c9446e.tar.zst
nixpkgs-2fa96bfc08a1150ad148bedb62ab11e928c9446e.zip
Merge pull request #250435 from tobim/pkgs/spdlog-1.12
spdlog: 1.11.0 -> 1.12.0
Diffstat (limited to 'pkgs/applications/networking/p2p')
-rw-r--r--pkgs/applications/networking/p2p/lokinet/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/networking/p2p/lokinet/default.nix b/pkgs/applications/networking/p2p/lokinet/default.nix
index 574380ed697..f77323d2bcf 100644
--- a/pkgs/applications/networking/p2p/lokinet/default.nix
+++ b/pkgs/applications/networking/p2p/lokinet/default.nix
@@ -8,13 +8,20 @@
 , nlohmann_json
 , pkg-config
 , spdlog
+, fmt_9
 , sqlite
 , systemd
 , unbound
 , zeromq
 }:
+let
+  # Upstream has received reports of incompatibilities with fmt, and other
+  # dependencies, see: https://github.com/oxen-io/lokinet/issues/2200.
+  spdlog' = spdlog.override {
+    fmt = fmt_9;
+  };
 
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   pname = "lokinet";
   version = "0.9.11";
 
@@ -36,7 +43,7 @@ stdenv.mkDerivation rec {
     libuv
     libsodium
     nlohmann_json
-    spdlog
+    spdlog'
     sqlite
     systemd
     unbound