From aabbed57e7fa75ed396626f5ac693b98883f89e2 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 10 Nov 2021 22:03:40 +0100 Subject: proj: Patch test OPEN_MAX limit assumption (#145371) One of the tests had a Linux-based assumption on the number of files that can be opened. I have submitted this patch upstream here, https://github.com/OSGeo/PROJ/pull/2934, and it's been merged but I don't expect to be able to update to a release before ZHF ends. Fixes #142875 --- pkgs/development/libraries/proj/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index caa270bcf60..134532308c8 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , sqlite @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w="; }; + patches = [ + (fetchpatch { + name = "Make-CApi-test-cross-platform.patch"; + url = "https://github.com/OSGeo/PROJ/commit/ac113a8898cded7f5359f1edd3abc17a78eee9b4.patch"; + sha256 = "0gz2xa5nxzck5c0yr7cspv3kw4cz3fxb2yic76w7qfvxidi7z1s1"; + }) + ]; + outputs = [ "out" "dev"]; nativeBuildInputs = [ cmake pkg-config ]; -- cgit 1.4.1