From d7aeec462c63ded1ec468543b193033db81348f9 Mon Sep 17 00:00:00 2001 From: Sebastian Wild Date: Sun, 3 Jul 2022 10:28:53 +0200 Subject: [PATCH] python310Packages.django: fix build with gdal and use correct geos version With the update of geos from 3.9 to 3.10, the use of django with gdal broke since django 3 does not support geos 3.10 --- pkgs/development/python-modules/django/3.nix | 4 ++-- .../python-modules/django/django_3_set_geos_gdal_lib.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 25f2533ad7d9..815c609428ac 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , substituteAll -, geos +, geos39 , gdal , asgiref , pytz @@ -27,7 +27,7 @@ buildPythonPackage rec { patches = lib.optional withGdal (substituteAll { src = ./django_3_set_geos_gdal_lib.patch; - inherit geos; + inherit geos39; inherit gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; }); diff --git a/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch b/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch index 6b853f8d85f0..15f0773dcf4f 100644 --- a/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch +++ b/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch @@ -18,7 +18,7 @@ diff -Nur a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos lib_path = settings.GEOS_LIBRARY_PATH except (AttributeError, ImportError, ImproperlyConfigured, OSError): - lib_path = None -+ lib_path = "@geos@/lib/libgeos_c@extension@" ++ lib_path = "@geos39@/lib/libgeos_c@extension@" # Setting the appropriate names for the GEOS-C library. if lib_path: