Commit b1985fcf authored by Manuel Frischknecht's avatar Manuel Frischknecht
Browse files

grip-search: fix build with GCC 13 

`grip-search` stopped building on GCC13 due to the standard
`cstdint` header not getting transitively included through
other standard headers anymore.

This change pulls in a patch from an open upstream PR [1]
that adds the necessary includes.

Since the current `substituteInPlace` patch that to the
built-in version string was overriding the `patches`
phase (preventing a simple declarative listing of patches
to be applied), I moved it to the `postPatch` hook instead.

[1]: https://github.com/sc0ty/grip/pull/6
parent 5465c7e2

pkgs/tools/text/grip-search/default.nix

+12 −3
Original line number Diff line number Diff line 
{ 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; {