colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #283782 from mfrischknecht/fix-grip-search-build

Browse Source 
grip-search: fix build with GCC 13
This commit is contained in:
a-n-n-a-l-e-e 2024-02-08 16:39:48 -08:00 committed by GitHub
commit b3ba9a8b8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/text/grip-search/default.nix
View File

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