mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
Merge pull request #283782 from mfrischknecht/fix-grip-search-build
grip-search: fix build with GCC 13
This commit is contained in:
commit
b3ba9a8b8a
@ -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; {
|
||||
|
Loading…
Reference in New Issue
Block a user