alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* nbd requires a static glib. Since it's the only package that does

Browse source 
so, don't build the default glib statically but pass a custom glib
  to nbd.

svn path=/nixpkgs/branches/x-updates/; revision=22658
This commit is contained in:
Eelco Dolstra 2010-07-19 08:44:32 +00:00
parent fbf2ed6067
commit 030981c1e7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/top-level/all-packages.nix
View file

@ -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;
};