diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-10-09 18:14:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-10-09 18:14:46 +0200 |
| commit | 549188c293cf522e1701438e9975c826a7f781d2 (patch) | |
| tree | f06b646b66bdc8b89181e07db7c9c56a23a9f37d /pkgs | |
| parent | df41edfe1c85d76c00f90c688f4f9552b0e61225 (diff) | |
| download | nixlib-549188c293cf522e1701438e9975c826a7f781d2.tar nixlib-549188c293cf522e1701438e9975c826a7f781d2.tar.gz nixlib-549188c293cf522e1701438e9975c826a7f781d2.tar.bz2 nixlib-549188c293cf522e1701438e9975c826a7f781d2.tar.lz nixlib-549188c293cf522e1701438e9975c826a7f781d2.tar.xz nixlib-549188c293cf522e1701438e9975c826a7f781d2.tar.zst nixlib-549188c293cf522e1701438e9975c826a7f781d2.zip | |
python.pkgs.django: fix gdal support on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/django/1.10-gis-libs.template.patch | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/django/1_11.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch index be196d000bcf..da154554d1b3 100644 --- a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch +++ b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch @@ -6,7 +6,7 @@ diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgda except (AttributeError, EnvironmentError, ImportError, ImproperlyConfigured): - lib_path = None -+ lib_path = "@gdal@/lib/libgdal.so" ++ lib_path = "@gdal@/lib/libgdal@extension@" if lib_path: lib_names = None @@ -18,7 +18,7 @@ diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeo except (AttributeError, EnvironmentError, ImportError, ImproperlyConfigured): - lib_path = None -+ lib_path = "@geos@/lib/libgeos_c.so" ++ lib_path = "@geos@/lib/libgeos_c@extension@" # Setting the appropriate names for the GEOS-C library. if lib_path: diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index f727751eda5f..483a8eb23d01 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -2,6 +2,7 @@ pythonOlder, geos, gdal, pytz }: + buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; @@ -19,6 +20,7 @@ buildPythonPackage rec { src = ./1.10-gis-libs.template.patch; geos = geos; gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; }) ]; |