diff options
author | a-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-02-08 16:39:48 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-08 16:39:48 -0800 |
commit | b3ba9a8b8aff5147c5609b7606550e7471eb2ee8 (patch) | |
tree | 9c329c478c727afe902a7535620b91326937eeba /pkgs/tools/text | |
parent | f1f689a8e8cec16394a26b1f4dda0e6bc3859bbe (diff) | |
parent | b1985fcf475e9066acd12a67b10a72891ceb14f5 (diff) |
Merge pull request #283782 from mfrischknecht/fix-grip-search-build
grip-search: fix build with GCC 13
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/grip-search/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/tools/text/grip-search/default.nix b/pkgs/tools/text/grip-search/default.nix index 57f0139dbc985..dd272af06bf3a 100644 --- a/pkgs/tools/text/grip-search/default.nix +++ b/pkgs/tools/text/grip-search/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, pkg-config, cmake, catch2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, boost, pkg-config, cmake, catch2 }: stdenv.mkDerivation rec { pname = "grip-search"; @@ -17,8 +17,17 @@ stdenv.mkDerivation rec { buildInputs = [ boost ]; - patchPhase = '' - substituteInPlace src/general/config.h --replace "CUSTOM-BUILD" "${version}" + patches = [ + # Can be removed after this upstream PR gets merged: https://github.com/sc0ty/grip/pull/6 + (fetchpatch { + name = "include-cstdint.patch"; + url = "https://github.com/sc0ty/grip/commit/da37b3c805306ee4ea617ce3f1487b8ee9876e50.patch"; + hash = "sha256-Xh++oDn5qn5NPgng7gfeCkO5FN9OmW+8fGhDLpAJfR8="; + }) + ]; + + postPatch = '' + substituteInPlace src/general/config.h --replace-fail "CUSTOM-BUILD" "${version}" ''; meta = with lib; { |