BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
grive2: pull gcc-12 upstream fix
This commit is contained in:
Sergei Trofimovich 2023-05-06 12:28:43 +01:00 committed by GitHub
commit e87e5f1753
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/tools/filesystems/grive2/default.nix
View file

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