From b458ef900f96ba60f91035d53eabf90340b6e773 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 6 May 2023 11:44:26 +0100 Subject: [PATCH] grive2: pull gcc-12 upstream fix Without the change build fails on `master` as: [ 14%] Building CXX object libgrive/CMakeFiles/grive.dir/src/base/Syncer.cc.o In file included from /build/source/libgrive/src/base/Syncer.cc:20: /build/source/libgrive/src/base/Syncer.hh:58:22: error: 'unique_ptr' in namespace 'std' does not name a template type 58 | virtual std::unique_ptr GetFolders() = 0; | ^~~~~~~~~~ Full build log: https://hydra.nixos.org/log/48jk4w7l1frlf6x8xjli2vyqqxk24ib1-grive2-0.5.3.drv --- pkgs/tools/filesystems/grive2/default.nix | 25 +++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index 5c2508bc22c..d5a19f42f3f 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, yajl +, cmake +, libgcrypt +, curl +, expat +, boost +, libiberty +}: stdenv.mkDerivation rec { version = "0.5.3"; @@ -11,6 +23,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-P6gitA5cXfNbNDy4ohRLyXj/5dUXkCkOdE/9rJPzNCg="; }; + patches = [ + # Backport gcc-12 support: + # https://github.com/vitalif/grive2/pull/363 + (fetchpatch { + name = "gcc-12.patch"; + url = "https://github.com/vitalif/grive2/commit/3cf1c058a3e61deb370dde36024a106a213ab2c6.patch"; + hash = "sha256-v2Pb6Qvgml/fYzh/VCjOvEVnFYMkOHqROvLLe61DmKA="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libgcrypt yajl curl expat boost libiberty ]; @@ -21,5 +43,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; }; - }