From 40d3c2f29a263c35525f6933f5bd50dd698081f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 4 Mar 2010 16:41:14 +0000 Subject: [PATCH] Adding graphicsmagick 1.3.7 for octave imread() and alike to work. svn path=/nixpkgs/trunk/; revision=20390 --- .../graphics/graphicsmagick/1.3.7.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/graphics/graphicsmagick/1.3.7.nix diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.7.nix b/pkgs/applications/graphics/graphicsmagick/1.3.7.nix new file mode 100644 index 000000000000..0d33cc757b90 --- /dev/null +++ b/pkgs/applications/graphics/graphicsmagick/1.3.7.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript +, libjpeg, libpng, libtiff, libxml2, zlib, libtool +, libX11}: + +let version = "1.3.7"; in + +stdenv.mkDerivation { + name = "graphicsmagick-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.gz"; + sha256 = "0bwyqqvajz0hi34gfbjvm9f78icxk3fb442mvn8q2rapmvfpfkgf"; + }; + + configureFlags = "--enable-shared"; + + buildInputs = + [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 + zlib libtool + ]; + + postInstall = '' + sed -i 's/-ltiff.*'\'/\'/ $out/bin/* + ''; + + meta = { + homepage = http://www.graphicsmagick.org; + description = "Swiss army knife of image processing"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53b8048bb2b4..6bdd4f797582 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2541,9 +2541,12 @@ let }; octave = import ../development/interpreters/octave { - inherit stdenv fetchurl gfortran readline ncurses perl flex qhull texinfo - graphicsmagick; + inherit stdenv fetchurl gfortran readline ncurses perl flex qhull texinfo; inherit (xlibs) libX11; + # Needed because later gm versions require an initialization the actual octave is not + # doing. + # http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html + graphicsmagick = graphicsmagick137; }; # mercurial (hg) bleeding edge version @@ -7387,6 +7390,12 @@ let inherit (xlibs) libX11; }; + graphicsmagick137 = import ../applications/graphics/graphicsmagick/1.3.7.nix { + inherit stdenv fetchurl bzip2 freetype graphviz ghostscript + libjpeg libpng libtiff libxml2 zlib libtool; + inherit (xlibs) libX11; + }; + gtkpod = import ../applications/audio/gtkpod { inherit stdenv fetchurl pkgconfig libgpod gettext perl perlXMLParser flex libid3tag libvorbis; inherit (gtkLibs) gtk glib;