Skip to content

Commit 7d9436b

Browse files
committed
gdal 3.8
1 parent 20d6962 commit 7d9436b

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

pkgs/development/libraries/gdal/default.nix

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{ lib
2+
, gcc11Stdenv
23
, stdenv
34
, callPackage
45
, fetchFromGitHub
@@ -77,16 +78,20 @@
7778
, zlib
7879
, zstd
7980
}:
80-
81+
let
82+
stdenv = gcc11Stdenv;
83+
in
8184
stdenv.mkDerivation (finalAttrs: {
8285
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
83-
version = "3.9.2";
86+
version = "3.8.0";
87+
88+
stdenv = gcc11Stdenv;
8489

8590
src = fetchFromGitHub {
8691
owner = "OSGeo";
8792
repo = "gdal";
8893
rev = "v${finalAttrs.version}";
89-
hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8=";
94+
hash = "sha256-Yu4cXSWSdh9HH/a5LA90/K3RRH1oQA9QMMa8heGLcAw=";
9095
};
9196

9297
patches = [
@@ -112,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
112117
] ++ lib.optionals useJava [ ant jdk ];
113118

114119
cmakeFlags = [
120+
"-DCMAKE_CXX_FLAGS=-fpermissive"
115121
"-DGDAL_USE_INTERNAL_LIBS=OFF"
116122
"-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include"
117123
"-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}"

0 commit comments

Comments
 (0)