diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-02-03 20:20:00 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-02-03 20:20:00 +0000 |
| commit | 318dc53aa3f8df86a67d05e8e9fa7234f358b399 (patch) | |
| tree | 64dfd3ff26fa41a8dce8f3f06289cafb62fbce39 | |
| parent | d26683f5a98e95a41a3ebf332b7940094c852af1 (diff) | |
| download | nixpkgs-318dc53aa3f8df86a67d05e8e9fa7234f358b399.tar nixpkgs-318dc53aa3f8df86a67d05e8e9fa7234f358b399.tar.gz nixpkgs-318dc53aa3f8df86a67d05e8e9fa7234f358b399.tar.bz2 nixpkgs-318dc53aa3f8df86a67d05e8e9fa7234f358b399.tar.lz nixpkgs-318dc53aa3f8df86a67d05e8e9fa7234f358b399.tar.xz nixpkgs-318dc53aa3f8df86a67d05e8e9fa7234f358b399.tar.zst nixpkgs-318dc53aa3f8df86a67d05e8e9fa7234f358b399.zip | |
Fixed dbus-glib compilation on FreeBSD
svn path=/nixpkgs/branches/stdenv-updates/; revision=19793
| -rw-r--r-- | pkgs/development/libraries/dbus-glib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 752ded6320b..a6d594af0f0 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nv4gxcbpa9f0907dmzmfm222w8y45z19cx27l85f5qknf8hncxm"; }; - buildInputs = [pkgconfig expat gettext]; + buildInputs = [pkgconfig expat gettext libiconv]; propagatedBuildInputs = [dbus.libs glib]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51799fad2b8..32571c95356 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3419,6 +3419,7 @@ let 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; }; dbus_java = import ../development/libraries/java/dbus-java { |