Unverified Commit e87e5f17 authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

Merge pull request #230311 from trofi/grive2-fix-gcc-12

grive2: pull gcc-12 upstream fix
parents 8d11076c b458ef90
Loading
Loading
Loading
Loading
+23 −2
Original line number Diff line number Diff line
{ 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;
  };

}