From b247577487392be6b2284dad895ec65bd124889c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 19 Apr 2015 12:19:52 +0200
Subject: [PATCH] Revert "Merge pull request #7450 from risicle/gdaldisablepy"

This reverts commit e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7, reversing
changes made to ca0d1aa9a3c2bf6e421f3fde4c4a4a234e1b9625.

See https://github.com/NixOS/nixpkgs/pull/7450#issuecomment-94259269
---
 pkgs/development/libraries/gdal/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 99b5b8dcea3..fe7d0869fbd 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,9 +1,6 @@
 { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, proj, geos, openssl
-, libpng
-# disabling python for now
-# , python, pythonPackages
-}:
+, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
+, libpng }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
   version = "1.11.2";
@@ -14,9 +11,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
     sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
   };
 
-  buildInputs = [ unzip libjpeg libtiff libpng proj openssl ]
-    # ++ [ python pythonPackages.numpy ]
-  ;
+  buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
 
   patches = [
     # 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-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: