diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2024-02-10 22:09:45 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2024-02-10 22:34:13 +0000 |
| commit | 4ad44f64c5dfc4a0d3a207631f0e387d2e2c153e (patch) | |
| tree | 30233a683eabb2a3129ad4a4b854ad31441973a8 /pkgs/applications/networking/p2p | |
| parent | ef6206934d5726ed9315ac78879f5ba2a6b55785 (diff) | |
retroshare: fix `gcc-13` build failure
Without the change the build fails on `master` as
https://hydra.nixos.org/build/247631504:
In file included from gui/statistics/Histogram.cpp:23:
gui/statistics/Histogram.h:35:27: error: 'uint32_t' was not declared in this scope
35 | const std::vector<uint32_t>& entries() const { return mBins; }
| ^~~~~~~~
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/retroshare/default.nix | 11 |
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 ]; |