summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authortoonn <toonn@toonn.io>2021-11-10 22:03:40 +0100
committerGitHub <noreply@github.com>2021-11-10 16:03:40 -0500
commitaabbed57e7fa75ed396626f5ac693b98883f89e2 (patch)
tree3d7334ac1c2e960d498fcf3c9f3ddde28634cf20 /pkgs/development
parent7b90eb5d8f33ab266b3384894fefe0d0dcda1c18 (diff)
downloadnixpkgs-aabbed57e7fa75ed396626f5ac693b98883f89e2.tar
nixpkgs-aabbed57e7fa75ed396626f5ac693b98883f89e2.tar.gz
nixpkgs-aabbed57e7fa75ed396626f5ac693b98883f89e2.tar.bz2
nixpkgs-aabbed57e7fa75ed396626f5ac693b98883f89e2.tar.lz
nixpkgs-aabbed57e7fa75ed396626f5ac693b98883f89e2.tar.xz
nixpkgs-aabbed57e7fa75ed396626f5ac693b98883f89e2.tar.zst
nixpkgs-aabbed57e7fa75ed396626f5ac693b98883f89e2.zip
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
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/proj/default.nix9
1 files changed, 9 insertions, 0 deletions
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 ];