Commit 36115b74 authored by Tom Hall's avatar Tom Hall Committed by github-actions[bot]
Browse files

libpostal: fix on darwin 

Apparently, recent XCode versions are stricter
https://github.com/openvenues/libpostal/issues/511

Second patch has a second hunk which adds a blank line, so it doesn't
apply cleanly. To get around this, I've included an edited version of
the patch with only the hunk we need.

(cherry picked from commit 2a675bbf)
parent d3f66cb7

pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch

0 → 100644
+24 −0
Original line number Diff line number Diff line 
From bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51 Mon Sep 17 00:00:00 2001

From: Al <albarrentine@gmail.com>

Date: Sun, 17 Dec 2017 20:17:01 -0500

Subject: [PATCH] [test] adding header to fix warning



---

 test/test_expand.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/test/test_expand.c b/test/test_expand.c

index 59ed9af7..2b211728 100644

--- a/test/test_expand.c

+++ b/test/test_expand.c

@@ -4,6 +4,7 @@

 #include <stdarg.h>

 

 #include "greatest.h"

+#include "../src/string_utils.h"

 #include "../src/libpostal.h"

 

 SUITE(libpostal_expansion_tests);

-- 

2.42.0

pkgs/development/libraries/libpostal/default.nix

+13 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:

{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:



stdenv.mkDerivation rec {

  pname = "libpostal";
@@ -11,6 +11,18 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk=";

  };



  patches = [

    # Fix darwin compilation with XCode 12 https://github.com/openvenues/libpostal/issues/511

    (fetchpatch {

      name = "Fix-C-compilation-macOS.patch";

      url = "https://github.com/openvenues/libpostal/commit/9fcf066e38121b5c1439fc6bdc9a7e02234c8622.patch";

      hash = "sha256-VpboGK+5sc1XrxMB051KWc8vP7Eu2g7zmTirzSaerns=";

    })

    # https://github.com/openvenues/libpostal/commit/bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51.patch

    # with extra hunk removed so it applies

    ./0001-test-adding-header-to-fix-warning.patch

  ];



  nativeBuildInputs = [ autoreconfHook ];



  configureFlags = [