about summary refs log tree commit diff
path: root/pkgs/applications/networking/p2p
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2024-02-11 09:58:30 -0500
committerGitHub <noreply@github.com>2024-02-11 09:58:30 -0500
commita0186a8fed13da3a582bcd988e7b6010e8cdcb91 (patch)
tree1b4668d0cbdc3ba55aed8f961a9cb94aa1b921ed /pkgs/applications/networking/p2p
parent301a1807f82ccbe1432734fd743db08c8b3093e7 (diff)
parent4ad44f64c5dfc4a0d3a207631f0e387d2e2c153e (diff)
Merge pull request #287888 from trofi/retroshare-gcc-13-fix
retroshare: fix `gcc-13` build failure
Diffstat (limited to 'pkgs/applications/networking/p2p')
-rw-r--r--pkgs/applications/networking/p2p/retroshare/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 680905e42bca1..1f4edd2e49dc8 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -1,4 +1,6 @@
-{ lib, mkDerivation, fetchFromGitHub, qmake, cmake, pkg-config, miniupnpc, bzip2
+{ lib, mkDerivation, fetchFromGitHub
+, fetchpatch
+, qmake, cmake, pkg-config, miniupnpc, bzip2
 , speex, libmicrohttpd, libxml2, libxslt, sqlcipher, rapidjson, libXScrnSaver
 , qtbase, qtx11extras, qtmultimedia, libgnome-keyring3
 }:
@@ -20,6 +22,13 @@ mkDerivation rec {
     # but we already have them checked out
     ./no-submodules.patch
     ./cpp-filesystem.patch
+
+    # Fix gcc-13 build failure
+    (fetchpatch {
+      name = "gcc-13.patch";
+      url = "https://github.com/RetroShare/RetroShare/commit/e1934fd9b03cd52c556eb06d94fb5d68b649592e.patch";
+      hash = "sha256-oqxQAsD4fmkWAH2kSVmmed/q0LzTW/iqUU1SgYNdFyk=";
+    })
   ];
 
   nativeBuildInputs = [ pkg-config qmake cmake ];