dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pythonPackages.django: always build with the GIS componnents

Browse Source 
There is no reason for django derivation to contain invalid GIS
extensions. This makes sure that the gis componnents (which are always
installed) can function properly.
This commit is contained in:
Lancelot SIX 2016-08-24 17:49:45 +02:00
parent 674aa05abc
commit 37ad0f8e6a
No known key found for this signature in database
GPG Key ID: 02E1542BA66FB047
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/top-level/python-packages.nix
View File

@ -8936,16 +8936,6 @@ in modules // {
django = self.django_1_10; django = self.django_1_10;
django_gis = self.django.override rec {
patches = [
(pkgs.substituteAll {
src = ../development/python-modules/django/1.10-gis-libs.template.patch;
geos = pkgs.geos;
gdal = pkgs.gdal;
})
];
};
django_1_10 = buildPythonPackage rec { django_1_10 = buildPythonPackage rec {
name = "Django-${version}"; name = "Django-${version}";
version = "1.10"; version = "1.10";
@ -8956,6 +8946,14 @@ in modules // {
sha256 = "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26"; sha256 = "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26";
}; };
patches = [
(pkgs.substituteAll {
src = ../development/python-modules/django/1.10-gis-libs.template.patch;
geos = pkgs.geos;
gdal = self.gdal;
})
];
# patch only $out/bin to avoid problems with starter templates (see #3134) # patch only $out/bin to avoid problems with starter templates (see #3134)
postFixup = '' postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath" wrapPythonProgramsIn $out/bin "$out $pythonPath"