summary refs log tree commit diff
diff options
context:
space:
mode:
authorRyan Lahfa <masterancpp@gmail.com>2023-05-21 21:03:40 +0200
committerGitHub <noreply@github.com>2023-05-21 21:03:40 +0200
commit9cc514b582c66eb84c5427a07653a99d48e0ee51 (patch)
treea76e96d94ed08cf340ea952bedf35c18ecbd3355
parent86529a543416f08de27fb4c99d43c21203ef0bbb (diff)
parent0781ee46f9463b1be668a3864c54d465e5e05331 (diff)
downloadnixpkgs-9cc514b582c66eb84c5427a07653a99d48e0ee51.tar
nixpkgs-9cc514b582c66eb84c5427a07653a99d48e0ee51.tar.gz
nixpkgs-9cc514b582c66eb84c5427a07653a99d48e0ee51.tar.bz2
nixpkgs-9cc514b582c66eb84c5427a07653a99d48e0ee51.tar.lz
nixpkgs-9cc514b582c66eb84c5427a07653a99d48e0ee51.tar.xz
nixpkgs-9cc514b582c66eb84c5427a07653a99d48e0ee51.tar.zst
nixpkgs-9cc514b582c66eb84c5427a07653a99d48e0ee51.zip
Merge pull request #233075 from Stekke/retroshare-filesystem
retroshare: fix build failure
-rw-r--r--pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch12
-rw-r--r--pkgs/applications/networking/p2p/retroshare/default.nix1
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch b/pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch
new file mode 100644
index 00000000000..e9aa64e2871
--- /dev/null
+++ b/pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch
@@ -0,0 +1,12 @@
+diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc
+index 8556b8198..d63699216 100644
+--- a/libretroshare/src/util/rsdir.cc
++++ b/libretroshare/src/util/rsdir.cc
+@@ -47,6 +47,7 @@
+ 
+ #include <fstream>
+ #include <stdexcept>
++#include <filesystem>
+ 
+ #if defined(WIN32) || defined(__CYGWIN__)
+ #include "util/rsstring.h"
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 7a213b88034..680905e42bc 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -19,6 +19,7 @@ mkDerivation rec {
     # The build normally tries to get git sub-modules during build
     # but we already have them checked out
     ./no-submodules.patch
+    ./cpp-filesystem.patch
   ];
 
   nativeBuildInputs = [ pkg-config qmake cmake ];