3 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 6ce05a670b1..980413bc8f8 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation {
       zlib libtool
     ];
 
+  postInstall = ''
+    sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
+  '';
+
   meta = {
     homepage = http://www.graphicsmagick.org;
     description = "Swiss army knife of image processing";
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index ea095706b22..f873f4e7475 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11}:
+libX11, graphicsmagick}:
 
 stdenv.mkDerivation {
   name = "octave-3.2.4";
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2;
     sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8";
   };
-  buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11];
+  buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11
+    graphicsmagick ];
   configureFlags = "--enable-readline --enable-dl";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de41954f378..53b8048bb2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2541,7 +2541,8 @@ let
   };
 
   octave = import ../development/interpreters/octave {
-    inherit stdenv fetchurl gfortran readline ncurses perl flex qhull texinfo;
+    inherit stdenv fetchurl gfortran readline ncurses perl flex qhull texinfo
+      graphicsmagick;
     inherit (xlibs) libX11;
   };