public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #7450 from risicle/gdaldisablepy"

Browse Source 
This reverts commit e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7, reversing
changes made to ca0d1aa9a3c2bf6e421f3fde4c4a4a234e1b9625.

See https://github.com/NixOS/nixpkgs/pull/7450#issuecomment-94259269
This commit is contained in:
Luca Bruno 2015-04-19 12:19:52 +02:00
parent e1db3adbac
commit b247577487
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/gdal/default.nix
View File

@ -1,9 +1,6 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, proj, geos, openssl , postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
, libpng , libpng }:
# disabling python for now
# , python, pythonPackages
}:
composableDerivation.composableDerivation {} (fixed: rec { composableDerivation.composableDerivation {} (fixed: rec {
version = "1.11.2"; version = "1.11.2";
@ -14,9 +11,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
}; };
buildInputs = [ unzip libjpeg libtiff libpng proj openssl ] buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
# ++ [ python pythonPackages.numpy ]
;
patches = [ patches = [
# This ensures that the python package is installed into gdal's prefix, # This ensures that the python package is installed into gdal's prefix,
@ -37,11 +32,9 @@ composableDerivation.composableDerivation {} (fixed: rec {
"--with-pg=${postgresql}/bin/pg_config" "--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql.lib}/bin/mysql_config" "--with-mysql=${mysql.lib}/bin/mysql_config"
"--with-geotiff=${libgeotiff}" "--with-geotiff=${libgeotiff}"
"--with-python" # optional
"--with-static-proj4=${proj}" # optional "--with-static-proj4=${proj}" # optional
"--with-geos=${geos}/bin/geos-config"# 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: # Prevent this: