Merge remote-tracking branch 'upstream/master' into HEAD

2 files changed, 9 insertions, 8 deletions

diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index 2131589339c09..c0ce81b3b425a 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, callPackage, libpng12, imagemagick,
-  autoreconfHook, glib, pstoedit, pkgconfig, gettext, darwin }:
+  autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin }:
 
 # TODO: Figure out why the resultant binary is somehow linked against
 # libpng16.so.16 rather than libpng12.
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook glib autofig pkgconfig gettext ];
   buildInputs = [ libpng12 imagemagick pstoedit ]
     ++ stdenv.lib.optionals stdenv.isDarwin
-       (with darwin.apple_sdk.frameworks; [ApplicationServices]);
-    
+       (with darwin.apple_sdk.frameworks; [ gd ApplicationServices ]);
+
   postUnpack = ''
     pushd $sourceRoot
     autofig autotrace-config.af
diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
index a254993a016b6..74631e88ebfb6 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/pkgs/applications/graphics/c3d/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, cmake, itk }:
+{ stdenv, fetchgit, cmake, itk, Cocoa }:
 
 stdenv.mkDerivation rec {
-  _name   = "c3d";
-  _version = "1.1.0";
-  name     = "${_name}-${_version}";
+  name    = "${pname}-${version}";
+  pname   = "c3d";
+  version = "1.1.0";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/c3d/git";
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ itk ];
+  buildInputs = [ itk ]
+    ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
   meta = with stdenv.lib; {
     homepage = http://www.itksnap.org/c3d;