From 2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Apr 2010 10:50:52 +0000
Subject: [PATCH] * libiodbc: don't pass all of Nixpkgs to the package.  There
 is no   reason why this shouldn't work, but it breaks NixOS evaluation on  
 x86_64-linux with weird segfaults and assertion failures, probably   due to a
 bug in the evaluator or the ATerm library.

svn path=/nixpkgs/trunk/; revision=20953
---
 pkgs/development/libraries/libiodbc/default.nix | 9 ++-------
 pkgs/top-level/all-packages.nix                 | 7 +++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix
index 2899547a215..fb3a2fd11d0 100644
--- a/pkgs/development/libraries/libiodbc/default.nix
+++ b/pkgs/development/libraries/libiodbc/default.nix
@@ -1,9 +1,4 @@
-a:
-
-let
-  inherit (a) stdenv fetchurl pkgconfig cg;
-  inherit (a.gtkLibs) gtk;
-in
+{ stdenv, fetchurl, pkgconfig, gtk, useGTK ? false }:
 
 stdenv.mkDerivation rec {
   name = "libiodbc-3.52.7";
@@ -13,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7";
   };
 
-  buildInputs = if cg "gtk" false then [ gtk pkgconfig ] else [];
+  buildInputs = stdenv.lib.optionals useGTK [ gtk pkgconfig ];
 
   meta = {
     description = "iODBC driver manager";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83cfc589dbd..7a411eceea8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4280,8 +4280,11 @@ let
     inherit stdenv fetchurl perl;
   };
 
-  libiodbc = makeOverridable (import ../development/libraries/libiodbc)
-    (pkgs // { cg = getPkgConfig "libiodbc"; });
+  libiodbc = makeOverridable (import ../development/libraries/libiodbc) {
+    inherit stdenv fetchurl pkgconfig;
+    inherit (gtkLibs) gtk;
+    useGTK = getPkgConfig "libiodbc" "gtk" false;
+  };
 
   libnice = import ../development/libraries/libnice {
     inherit stdenv fetchurl pkgconfig;