From dbfee3293bdb61a671b2a05ba4042eba265be29e Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 10 Nov 2021 15:14:41 +0100 Subject: [PATCH] proj: Patch test OPEN_MAX limit assumption 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. ZHF: #144627 Fixes #142875 --- pkgs/development/libraries/proj/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index caa270bcf60f8..5a27e671db7ae 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,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w="; }; + patches = [ (fetchpatch { + url = "https://github.com/OSGeo/PROJ/commit/ac113a8898cded7f5359f1edd3abc17a78eee9b4.patch"; + sha256 = "0gz2xa5nxzck5c0yr7cspv3kw4cz3fxb2yic76w7qfvxidi7z1s1"; + }) + ]; + outputs = [ "out" "dev"]; nativeBuildInputs = [ cmake pkg-config ];