mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
nixpkgs/pkgs/development/python-modules/django/1.10-gis-libs.template.patch

25 lines
921 B
Diff
Raw Normal View History

django: add a django_gis variant which patches django to properly point at its gis libs but therefore also has them as dependencies (gdal for one can be quite big) Conflicts: pkgs/top-level/python-packages.nix
2015-04-04 21:19:52 +01:00
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
--- a/django/contrib/gis/gdal/libgdal.py
+++ b/django/contrib/gis/gdal/libgdal.py
@@ -17,7 +17,7 @@ try:
lib_path = settings.GDAL_LIBRARY_PATH
except (AttributeError, EnvironmentError,
ImportError, ImproperlyConfigured):
- lib_path = None
python.pkgs.django: fix gdal support on darwin
2017-10-09 17:14:15 +01:00
+ lib_path = "@gdal@/lib/libgdal@extension@"
django: add a django_gis variant which patches django to properly point at its gis libs but therefore also has them as dependencies (gdal for one can be quite big) Conflicts: pkgs/top-level/python-packages.nix
2015-04-04 21:19:52 +01:00
if lib_path:
lib_names = None
diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
--- a/django/contrib/gis/geos/libgeos.py
+++ b/django/contrib/gis/geos/libgeos.py
pythonPackags.django: default from 1_9 to 1_10
2016-08-03 08:10:38 +01:00
@@ -26,7 +26,7 @@ try:
lib_path = settings.GEOS_LIBRARY_PATH
except (AttributeError, EnvironmentError,
ImportError, ImproperlyConfigured):
- lib_path = None
python.pkgs.django: fix gdal support on darwin
2017-10-09 17:14:15 +01:00
+ lib_path = "@geos@/lib/libgeos_c@extension@"
django: add a django_gis variant which patches django to properly point at its gis libs but therefore also has them as dependencies (gdal for one can be quite big) Conflicts: pkgs/top-level/python-packages.nix
2015-04-04 21:19:52 +01:00
pythonPackags.django: default from 1_9 to 1_10
2016-08-03 08:10:38 +01:00
# Setting the appropriate names for the GEOS-C library.
if lib_path:
Copy permalink