diff options
author | lethalman <lucabru@src.gnome.org> | 2015-04-19 11:54:50 +0200 |
---|---|---|
committer | lethalman <lucabru@src.gnome.org> | 2015-04-19 11:54:50 +0200 |
commit | e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7 (patch) | |
tree | adf9fe603e172a097eff46d11a9a1d60b7c1f91a /pkgs/development/libraries/gdal/default.nix | |
parent | ca0d1aa9a3c2bf6e421f3fde4c4a4a234e1b9625 (diff) | |
parent | f2e8e6a598080f4a58959d60c4ceab336a77e917 (diff) | |
download | nixpkgs-e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7.tar nixpkgs-e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7.tar.gz nixpkgs-e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7.tar.bz2 nixpkgs-e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7.tar.lz nixpkgs-e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7.tar.xz nixpkgs-e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7.tar.zst nixpkgs-e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7.zip |
Merge pull request #7450 from risicle/gdaldisablepy
gdal: just disable python support instead of marking gdal broken wholesa...
Diffstat (limited to 'pkgs/development/libraries/gdal/default.nix')
-rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index fe7d0869fbd..99b5b8dcea3 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl -, libpng }: +, postgresql, mysql, libgeotiff, proj, geos, openssl +, libpng +# disabling python for now +# , python, pythonPackages +}: composableDerivation.composableDerivation {} (fixed: rec { version = "1.11.2"; @@ -11,7 +14,9 @@ composableDerivation.composableDerivation {} (fixed: rec { sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; }; - buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; + buildInputs = [ unzip libjpeg libtiff libpng proj openssl ] + # ++ [ python pythonPackages.numpy ] + ; patches = [ # This ensures that the python package is installed into gdal's prefix, @@ -32,9 +37,11 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql.lib}/bin/mysql_config" "--with-geotiff=${libgeotiff}" - "--with-python" # optional "--with-static-proj4=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional + # Enabling built-in python bindings causes + # http://hydra.nixos.org/build/21344907/nixlog/1/raw - disable for now + #"--with-python" # optional ]; # Prevent this: |