diff options
author | vbgl <vbgl@users.noreply.github.com> | 2015-09-10 19:37:48 +0200 |
---|---|---|
committer | vbgl <vbgl@users.noreply.github.com> | 2015-09-10 19:37:48 +0200 |
commit | 83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93 (patch) | |
tree | fe53b1ca4fa65836758c88a16cbbb392fa23a817 /pkgs/development | |
parent | 2cc8680b88f1198fd4ea471572d450d2f2e377fb (diff) | |
parent | 4501d4f5d99337db7de2dd440f3e70f014f23e73 (diff) | |
download | nixpkgs-83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93.tar nixpkgs-83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93.tar.gz nixpkgs-83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93.tar.bz2 nixpkgs-83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93.tar.lz nixpkgs-83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93.tar.xz nixpkgs-83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93.tar.zst nixpkgs-83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93.zip |
Merge pull request #9423 from vbgl/gdal
gdal: fix standalone python programs (fixes #9386)
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 22a721191dd..6e1ada69039 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl +, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , libpng }: composableDerivation.composableDerivation {} (fixed: rec { @@ -11,7 +11,8 @@ composableDerivation.composableDerivation {} (fixed: rec { sha256 = "53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6"; }; - buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; + buildInputs = [ unzip libjpeg libtiff libpng proj openssl ] + ++ (with pythonPackages; [ python numpy wrapPython ]); patches = [ # This ensures that the python package is installed into gdal's prefix, @@ -44,11 +45,15 @@ composableDerivation.composableDerivation {} (fixed: rec { # TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files # error: bad install directory or PYTHONPATH preBuild = '' - pythonInstallDir=$out/lib/${python.libPrefix}/site-packages + pythonInstallDir=$out/lib/${pythonPackages.python.libPrefix}/site-packages mkdir -p $pythonInstallDir export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir ''; + postInstall = '' + wrapPythonPrograms + ''; + meta = { description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; |