diff options
author | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
commit | b7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch) | |
tree | c4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /pkgs/development/python-modules | |
parent | bc025e83bd6c44df38851ef23da53359a0e62841 (diff) | |
parent | 532b2222965377e77ed884c463ee2751fb51dba3 (diff) | |
download | nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.gz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.bz2 nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.lz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.xz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.zst nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/django/1.10-gis-libs.template.patch (renamed from pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch) | 16 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyqt/4.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch index 7757691bfca1..be196d000bcf 100644 --- a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch +++ b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch @@ -13,12 +13,12 @@ diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgda 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" +@@ -26,7 +26,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: + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index b2d5b93d9f78..746cc747d72d 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation { ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" ''; - buildInputs = [ python pkgconfig makeWrapper qt4 lndir ]; + buildInputs = [ pkgconfig makeWrapper qt4 lndir ]; - propagatedBuildInputs = [ pythonPackages.sip_4_16 ]; + propagatedBuildInputs = [ pythonPackages.sip_4_16 python ]; postInstall = '' for i in $out/bin/*; do diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 7ec89ffd7eec..69fb6e266ea5 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { }; buildInputs = [ - python pkgconfig makeWrapper lndir + pkgconfig makeWrapper lndir qtbase qtsvg qtwebkit qmakeHook ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ sip python ]; configurePhase = '' runHook preConfigure |