[Nix-dev] Dependency on libiconv

[Ludovic Courtès]

Hi,

Sander van der Burg <S.vanderBurg at tudelft.nl> writes:

> You can view the changes in this commit at:
>    https://svn.nixos.org/viewvc/nix?rev=19793&view=rev
>
> Modified:
>    nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus-glib/default.nix
>    nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
>
> Log:
> Fixed dbus-glib compilation on FreeBSD

[...]

> --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus-glib/default.nix	2010-02-03 20:12:18 UTC (rev 19792)
> +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus-glib/default.nix	2010-02-03 20:20:00 UTC (rev 19793)
> @@ -8,7 +8,7 @@
>      sha256 = "0nv4gxcbpa9f0907dmzmfm222w8y45z19cx27l85f5qknf8hncxm";
>    };
>    
> -  buildInputs = [pkgconfig expat gettext];
> +  buildInputs = [pkgconfig expat gettext libiconv];

[...]

>    dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) {
>      inherit fetchurl stdenv pkgconfig gettext dbus expat glib;
> +    libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null;
>    };

Libiconv is for all non-GNU systems, and only them.  So the Right Thing
would be to have:

  buildInputs = ... ++ stdenv.lib.optional (! (stdenv ? glibc)) libiconv;

and leave ‘all-packages.nix’ part free of any conditional (does having a
build input equal to ‘null’ always work?).

Thanks,
Ludo’.