From 030981c1e71f21987204804888df81d719d55817 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Jul 2010 08:44:32 +0000
Subject: [PATCH] * nbd requires a static glib.  Since it's the only package
 that does   so, don't build the default glib statically but pass a custom
 glib   to nbd.

svn path=/nixpkgs/branches/x-updates/; revision=22658
---
 pkgs/top-level/all-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9754b2b985a9..dee8abbda739 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1231,7 +1231,10 @@ let
   };
 
   nbd = import ../tools/networking/nbd {
-    inherit fetchurl stdenv pkgconfig glib;
+    inherit fetchurl stdenv pkgconfig;
+    glib = gtkLibs.glib.override {
+      stdenv = makeStaticBinaries stdenv;
+    };
   };
 
   nc6 = composedArgsAndFun (import ../tools/networking/nc6/1.0.nix) {
@@ -4287,7 +4290,7 @@ let
 
   gtkLibs220 = rec {
 
-    glib = import ../development/libraries/glib/2.24.x.nix {
+    glib = makeOverridable (import ../development/libraries/glib/2.24.x.nix) {
       inherit fetchurl stdenv pkgconfig gettext perl zlib;
       libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null;
     };