From ab07f38b744a61d2079f7ac1ed7334dfd8110cff Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 22 Oct 2024 10:12:14 +0200 Subject: [PATCH] gdal 3.8 --- pkgs/development/libraries/gdal/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 6bddc8c6b5e5c..3d7513ec97b7e 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,4 +1,5 @@ { lib +, gcc11Stdenv , stdenv , callPackage , fetchFromGitHub @@ -77,16 +78,20 @@ , zlib , zstd }: - +let + stdenv = gcc11Stdenv; +in stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.9.2"; + version = "3.8.0"; + + stdenv = gcc11Stdenv; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8="; + hash = "sha256-Yu4cXSWSdh9HH/a5LA90/K3RRH1oQA9QMMa8heGLcAw="; }; patches = [ @@ -112,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals useJava [ ant jdk ]; cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-fpermissive" "-DGDAL_USE_INTERNAL_LIBS=OFF" "-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include" "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}"