tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

retroshare: 0.6.6 -> 0.6.7.2

Emily 416aae70 58b9ac89

+35 -28
unified split
-12
pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch
··· 1 - diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc 2 - index 8556b8198..d63699216 100644 3 - --- a/libretroshare/src/util/rsdir.cc 4 - +++ b/libretroshare/src/util/rsdir.cc 5 - @@ -47,6 +47,7 @@ 6 - 7 - #include <fstream> 8 - #include <stdexcept> 9 - +#include <filesystem> 10 - 11 - #if defined(WIN32) || defined(__CYGWIN__) 12 - #include "util/rsstring.h"
+12 -12
pkgs/applications/networking/p2p/retroshare/default.nix
··· 1 - { lib, mkDerivation, fetchFromGitHub 2 - , fetchpatch 1 + { lib, stdenv, mkDerivation, fetchFromGitHub 3 2 , qmake, cmake, pkg-config, miniupnpc, bzip2 4 3 , speex, libmicrohttpd, libxml2, libxslt, sqlcipher, rapidjson, libXScrnSaver 5 4 , qtbase, qtx11extras, qtmultimedia, libgnome-keyring ··· 7 6 8 7 mkDerivation rec { 9 8 pname = "retroshare"; 10 - version = "0.6.6"; 9 + version = "0.6.7.2"; 11 10 12 11 src = fetchFromGitHub { 13 12 owner = "RetroShare"; 14 13 repo = "RetroShare"; 15 14 rev = "v${version}"; 16 - sha256 = "1hsymbhsfgycj39mdkrdp2hgq8irmvxa4a6jx2gg339m1fgf2xmh"; 15 + hash = "sha256-1A1YvOWIiWlP1JPUTg5Z/lxVGCBv4tCPf5sZdPogitU="; 17 16 fetchSubmodules = true; 18 17 }; 19 18 ··· 21 20 # The build normally tries to get git sub-modules during build 22 21 # but we already have them checked out 23 22 ./no-submodules.patch 24 - ./cpp-filesystem.patch 25 - 26 - # Fix gcc-13 build failure 27 - (fetchpatch { 28 - name = "gcc-13.patch"; 29 - url = "https://github.com/RetroShare/RetroShare/commit/e1934fd9b03cd52c556eb06d94fb5d68b649592e.patch"; 30 - hash = "sha256-oqxQAsD4fmkWAH2kSVmmed/q0LzTW/iqUU1SgYNdFyk="; 31 - }) 32 23 ]; 33 24 34 25 nativeBuildInputs = [ pkg-config qmake cmake ]; ··· 47 38 "RS_MINI_VERSION=${lib.versions.patch version}" 48 39 "RS_EXTRA_VERSION=" 49 40 ]; 41 + 42 + postPatch = '' 43 + # Build libsam3 as C, not C++. No, I have no idea why it tries to 44 + # do that, either. 45 + substituteInPlace libretroshare/src/libretroshare.pro \ 46 + --replace-fail \ 47 + "LIBSAM3_MAKE_PARAMS =" \ 48 + "LIBSAM3_MAKE_PARAMS = CC=$CC AR=$AR" 49 + ''; 50 50 51 51 postInstall = '' 52 52 # BT DHT bootstrap
+23 -4
pkgs/applications/networking/p2p/retroshare/no-submodules.patch
··· 1 + Submodule libretroshare contains modified content 1 2 diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro 2 - index 84d18944e..71aeb67d2 100644 3 + index 923f878c..ef00f3d7 100644 3 4 --- a/libretroshare/src/libretroshare.pro 4 5 +++ b/libretroshare/src/libretroshare.pro 5 - @@ -870,20 +870,14 @@ rs_jsonapi { 6 + @@ -930,20 +930,14 @@ rs_jsonapi { 6 7 genrestbedlib.variable_out = PRE_TARGETDEPS 7 8 win32-g++:isEmpty(QMAKE_SH) { 8 9 genrestbedlib.commands = \ ··· 28 29 mkdir -p $${RESTBED_BUILD_PATH} && 29 30 } 30 31 genrestbedlib.commands += \ 31 - @@ -991,14 +985,9 @@ rs_broadcast_discovery { 32 + @@ -1063,14 +1057,9 @@ rs_broadcast_discovery { 32 33 udpdiscoverycpplib.variable_out = PRE_TARGETDEPS 33 34 win32-g++:isEmpty(QMAKE_SH) { 34 35 udpdiscoverycpplib.commands = \ ··· 44 45 } 45 46 udpdiscoverycpplib.commands += \ 46 47 cd $$shell_path($${UDP_DISCOVERY_BUILD_PATH}) && \ 48 + @@ -1106,15 +1095,13 @@ rs_sam3_libsam3 { 49 + win32-g++:isEmpty(QMAKE_SH) { 50 + LIBSAM3_MAKE_PARAMS = CC=gcc 51 + libsam3.commands = \ 52 + - cd /D $$shell_path($${RS_SRC_PATH}) && git submodule update --init supportlibs/libsam3 || cd . $$escape_expand(\\n\\t) \ 53 + + cd /D $$shell_path($${RS_SRC_PATH}) && cd . $$escape_expand(\\n\\t) \ 54 + $(CHK_DIR_EXISTS) $$shell_path($$LIBSAM3_BUILD_PATH) $(MKDIR) $$shell_path($${LIBSAM3_BUILD_PATH}) $$escape_expand(\\n\\t) \ 55 + $(COPY_DIR) $$shell_path($${LIBSAM3_SRC_PATH}) $$shell_path($${LIBSAM3_BUILD_PATH}) || cd . $$escape_expand(\\n\\t) 56 + } else { 57 + LIBSAM3_MAKE_PARAMS = 58 + libsam3.commands = \ 59 + - cd $${RS_SRC_PATH} && ( \ 60 + - git submodule update --init supportlibs/libsam3 || \ 61 + - true ) && \ 62 + + cd $${RS_SRC_PATH} && \ 63 + mkdir -p $${LIBSAM3_BUILD_PATH} && \ 64 + (cp -r $${LIBSAM3_SRC_PATH}/* $${LIBSAM3_BUILD_PATH} || true) && 65 + } 47 66 diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro 48 - index 654efd170..06cba9ba3 100644 67 + index d73117b84..b2fc6799a 100644 49 68 --- a/retroshare-gui/src/retroshare-gui.pro 50 69 +++ b/retroshare-gui/src/retroshare-gui.pro 51 70 @@ -66,10 +66,7 @@ rs_gui_cmark {