Merge branch 'master' into staging

3 files changed, 7 insertions, 5 deletions

diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index a09d60f788c7..c4a0981dbb3c 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
 , yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo
+, ApplicationServices
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
     [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
       pango gd gts
     ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ]
-    ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
+    ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices gettext ];
 
   CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo";
 
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index e815cded09a1..b0ccc5428bb8 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat
 , yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo
 , flex
+, ApplicationServices
 }:
 
 stdenv.mkDerivation rec {
@@ -20,9 +21,9 @@ stdenv.mkDerivation rec {
     [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
     ] ++ stdenv.lib.optionals (xorg != null)
       (with xorg; [ xlibsWrapper libXrender libXaw libXpm ])
-    ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
+    ++ stdenv.lib.optionals (stdenv.isDarwin) [ ApplicationServices gettext ];
 
-  CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")
+  CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin)
     "-I${cairo.dev}/include/cairo";
 
   configureFlags = stdenv.lib.optional (xorg == null) "--without-x";
diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
index 300e05023b1b..70f9e29d0f5d 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/pkgs/tools/graphics/icoutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "icoutils-0.31.0";
+  name = "icoutils-0.31.1";
 
   src = fetchurl {
     url = "mirror://savannah/icoutils/${name}.tar.bz2";
-    sha256 = "0wdgyfb1clrn3maq84vi4vkwjydy72p5hzk6kb9nb3a19bbxk5d8";
+    sha256 = "14rhd7p7v0rvxsfnrgxf5l4rl6n52h2aq09583glqpgjg0y9vqi6";
   };
 
   buildInputs = [ makeWrapper libpng perl ];