diff options
| author | Peter Simons <simons@cryp.to> | 2010-05-19 12:25:38 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2010-05-19 12:25:38 +0000 |
| commit | af899f1956129102dc66586852499055f19dcac2 (patch) | |
| tree | 76156bda7c178a62656b9d57286dd9cdf32f73cb | |
| parent | 0db2caa183104fe4102a2c01915b75bca45d48c9 (diff) | |
| download | nixlib-af899f1956129102dc66586852499055f19dcac2.tar nixlib-af899f1956129102dc66586852499055f19dcac2.tar.gz nixlib-af899f1956129102dc66586852499055f19dcac2.tar.bz2 nixlib-af899f1956129102dc66586852499055f19dcac2.tar.lz nixlib-af899f1956129102dc66586852499055f19dcac2.tar.xz nixlib-af899f1956129102dc66586852499055f19dcac2.tar.zst nixlib-af899f1956129102dc66586852499055f19dcac2.zip | |
pkgs/desktops/gnome-2.28/platform/libIDL: fixed build failure on Darwin
The build needs gettext, or it will fail to link libintl. svn path=/nixpkgs/trunk/; revision=21860
| -rw-r--r-- | pkgs/desktops/gnome-2.28/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2.28/platform/libIDL/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index a382ee4fbafd..22f926021503 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -29,6 +29,7 @@ rec { libIDL = import ./platform/libIDL { inherit (pkgs) stdenv fetchurl flex bison pkgconfig; inherit (pkgs.gtkLibs) glib; + gettext = if pkgs.stdenv.isDarwin then pkgs.gettext else null; }; ORBit2 = import ./platform/ORBit2 { diff --git a/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix b/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix index 29897623abfb..f48b0821f126 100644 --- a/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, pkgconfig, glib}: +{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext ? null}: stdenv.mkDerivation { name = "libIDL-0.8.13"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = mirror://gnome/sources/libIDL/0.8/libIDL-0.8.13.tar.bz2; sha256 = "0w9b4q5sllwncz498sj5lmc3ajzc8x74dy0jy27m2yg9v887xk5w"; }; - buildInputs = [ flex bison pkgconfig glib ]; + buildInputs = [ flex bison pkgconfig glib gettext ]; } |