mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 08:31:59 +00:00
7d3dacbdab
Conflicts: pkgs/top-level/python-packages.nix
25 lines
877 B
Diff
25 lines
877 B
Diff
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
|
|
+ lib_path = "@gdal@/lib/libgdal.so"
|
|
|
|
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
|
|
@@ -23,7 +23,7 @@ try:
|
|
lib_path = settings.GEOS_LIBRARY_PATH
|
|
except (AttributeError, EnvironmentError,
|
|
ImportError, ImproperlyConfigured):
|
|
- lib_path = None
|
|
+ lib_path = "@geos@/lib/libgeos_c.so"
|
|
|
|
# Setting the appropriate names for the GEOS-C library.
|
|
if lib_path:
|