public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation for GLib on FreeBSD

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19790
This commit is contained in:
Sander van der Burg 2010-02-03 16:12:19 +00:00
parent a617a7c239
commit d26683f5a9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glib/2.22.x.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl }: { stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glib-2.22.4"; name = "glib-2.22.4";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "055dv2hymbyzwpcd39r97x747vsvlkyywa826zr75dzambw6n7qd"; sha256 = "055dv2hymbyzwpcd39r97x747vsvlkyywa826zr75dzambw6n7qd";
}; };
buildInputs = [pkgconfig gettext perl]; buildInputs = [pkgconfig gettext perl libiconv];
# The nbd package depends on a static version of this library; hence # The nbd package depends on a static version of this library; hence
# the default configure flag --disable-static is switched off. # the default configure flag --disable-static is switched off.

1
pkgs/top-level/all-packages.nix
View File

@ -3849,6 +3849,7 @@ let
glib = import ../development/libraries/glib/2.22.x.nix { glib = import ../development/libraries/glib/2.22.x.nix {
inherit fetchurl stdenv pkgconfig gettext perl; inherit fetchurl stdenv pkgconfig gettext perl;
libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null;
}; };
glibmm = import ../development/libraries/glibmm/2.22.x.nix { glibmm = import ../development/libraries/glibmm/2.22.x.nix {