nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Lluís Batlle i Rossell 2010-03-04 16:41:10 +00:00
parent 22065c11d9
commit ba274e578c
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/graphicsmagick/default.nix
View File

@ -19,6 +19,10 @@ stdenv.mkDerivation {
zlib libtool zlib libtool
]; ];
postInstall = ''
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
'';
meta = { meta = {
homepage = http://www.graphicsmagick.org; homepage = http://www.graphicsmagick.org;
description = "Swiss army knife of image processing"; description = "Swiss army knife of image processing";

5
pkgs/development/interpreters/octave/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
libX11}: libX11, graphicsmagick}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "octave-3.2.4"; name = "octave-3.2.4";
@ -7,6 +7,7 @@ stdenv.mkDerivation {
url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2; url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2;
sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8"; 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"; configureFlags = "--enable-readline --enable-dl";
} }

3
pkgs/top-level/all-packages.nix
View File

@ -2541,7 +2541,8 @@ let
}; };
octave = import ../development/interpreters/octave { 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; inherit (xlibs) libX11;
}; };