Made graphicsmagick-config not say anything about libraries that would be needed for static linking, because we are linking it dynamically.

Made octave link with graphicsmagick to get imread() working.

Nevertheless, imread does not work, because of some problems between octave and latest versions of graphicsmagick: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html

Next to do: add an older version of graphics magick for octave.

svn path=/nixpkgs/trunk/; revision=20389

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";

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";
 }

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;
   };