From 2a73189a9c4bb0c98c6d4bc89e363ebce4ce5e0d Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sat, 7 Sep 2013 08:09:34 +1000 Subject: [PATCH] deluge: fix build on darwin (close #930) --- pkgs/desktops/gnome-2/platform/libglade/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 93490007692..5e5bae4d181 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -11,4 +11,6 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7fe9e36889..74f89506fbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4919,7 +4919,12 @@ let libtommath = callPackage ../development/libraries/libtommath { }; - libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { + # fix "unrecognized option -arch" error + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; libtunepimp = callPackage ../development/libraries/libtunepimp { };