nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-19 11:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

pdal: add upstream patch for GDAL 3.10

Browse Source
This commit is contained in:
Emily 2024-11-27 20:40:56 +00:00
parent 1677c4a3d5
commit 411c5609d0
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/by-name/pd/pdal/package.nix
View File

@ -2,6 +2,8 @@
, stdenv , stdenv
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, fetchurl
, testers , testers
, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format , enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format
@ -37,6 +39,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-aRWVBCMGr/FX3g8tF7PP3sarN2DHx7AG3vvGAkQTuAM="; hash = "sha256-aRWVBCMGr/FX3g8tF7PP3sarN2DHx7AG3vvGAkQTuAM=";
}; };
patches = [
(fetchpatch {
name = "pdal-tests-gdal-3.10-compatibility.patch";
url = "https://github.com/PDAL/PDAL/commit/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f.patch";
hash = "sha256-8AeWcMeZXth6y+Ox1rhK7cEySql//Jig46rHw7PyJh4=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
@ -109,6 +119,14 @@ stdenv.mkDerivation (finalAttrs: {
"pdal_app_plugin_test" "pdal_app_plugin_test"
]; ];
# Add binary test file that we can’t apply from the patch.
postPatch = ''
ln -s ${fetchurl {
url = "https://github.com/PDAL/PDAL/raw/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f/test/data/gdal/1234_red_0_green_0_blue.tif";
hash = "sha256-x/jHMhZTKmQxlTkswDGszhBIfP/qgY0zJ8QIz+wR5S4=";
}} test/data/gdal/1234_red_0_green_0_blue.tif
'';
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
# tests are flaky and they seem to fail less often when they don't run in # tests are flaky and they seem to fail less often when they don't run in