diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems/grive2/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/filesystems/grive2/default.nix | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/grive2/default.nix b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix index 9d1d021641a9..d5a19f42f3f0 100644 --- a/nixpkgs/pkgs/tools/filesystems/grive2/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix @@ -1,16 +1,38 @@ -{ 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.1"; + version = "0.5.3"; pname = "grive2"; src = fetchFromGitHub { owner = "vitalif"; repo = "grive2"; rev = "v${version}"; - sha256 = "1kv34ys8qarjsxpb1kd8dp7b3b4ycyiwjzd6mg97d3jk7405g6nm"; + 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; }; - } |