colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

retroshare: fix gcc-13 build failure

Browse Source 
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; }
          |                           ^~~~~~~~
This commit is contained in:
Sergei Trofimovich 2024-02-10 22:09:45 +00:00
parent ef6206934d
commit 4ad44f64c5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/p2p/retroshare/default.nix
View File

@ -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 ];