From f2e8e6a598080f4a58959d60c4ceab336a77e917 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 18 Apr 2015 20:36:34 +0100
Subject: [PATCH] gdal: just disable python support instead of marking gdal
broken wholesale
---
pkgs/development/libraries/gdal/default.nix | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index f6a49d61f6d9..dda49376fe16 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 ]
+ ;
# Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
# Unset CC and CXX as they confuse libtool.
@@ -26,9 +31,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
];
meta = {
@@ -37,6 +44,5 @@ composableDerivation.composableDerivation {} (fixed: rec {
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
- broken = true; # http://hydra.nixos.org/build/21344907/nixlog/1/raw
};
})