diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-01-16 16:28:08 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-01-16 16:28:08 +0000 |
commit | dbb8c452bb966c9aad8dedf2a08dd2375574ec6c (patch) | |
tree | 2528c0f7abb4a106fb3e00b6a1dbab5f2931c31b /pkgs/applications/graphics/fbida | |
parent | 40012b3588aa06b0a0d58385f9ccfad94f6bff0c (diff) | |
download | nixpkgs-dbb8c452bb966c9aad8dedf2a08dd2375574ec6c.tar nixpkgs-dbb8c452bb966c9aad8dedf2a08dd2375574ec6c.tar.gz nixpkgs-dbb8c452bb966c9aad8dedf2a08dd2375574ec6c.tar.bz2 nixpkgs-dbb8c452bb966c9aad8dedf2a08dd2375574ec6c.tar.lz nixpkgs-dbb8c452bb966c9aad8dedf2a08dd2375574ec6c.tar.xz nixpkgs-dbb8c452bb966c9aad8dedf2a08dd2375574ec6c.tar.zst nixpkgs-dbb8c452bb966c9aad8dedf2a08dd2375574ec6c.zip |
* fbida: fix a segfault in exiftran.
svn path=/nixpkgs/trunk/; revision=25588
Diffstat (limited to 'pkgs/applications/graphics/fbida')
-rw-r--r-- | pkgs/applications/graphics/fbida/default.nix | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index f7482e0bfe7..65f5cdb2a36 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,34 +1,29 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng +, pkgconfig, freetype, fontconfig +}: - version = a.lib.attrByPath ["version"] "2.07" a; - buildInputs = with a; [ - libjpeg libexif giflib libtiff libpng - imagemagick ghostscript which curl - pkgconfig freetype fontconfig - ]; -in -rec { +stdenv.mkDerivation rec { + name = "fbida-2.07"; + src = fetchurl { - url = "http://dl.bytesex.org/releases/fbida/fbida-${version}.tar.gz"; + url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; sha256 = "0i6v3fvjc305pfw48sglb5f22lwxldmfch6mjhqbcp7lqkkxw435"; }; - inherit buildInputs; - configureFlags = []; - makeFlags = [ - "prefix=$out" - "verbose=yes" + patches = + [ # Fetch a segfault in exiftran (http://bugs.gentoo.org/284753). + (fetchurl { + url = http://bugs.gentoo.org/attachment.cgi?id=203930; + sha256 = "0zwva6qbahjdzk7vaw7cn3mj0326kawqw58rspvrz9m4vw5kqdzj"; + }) ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doMakeInstall" (a.doPatchShebangs "$out/bin")]; - - name = "fbida-" + version; + buildInputs = + [ pkgconfig libexif libjpeg giflib libpng giflib freetype fontconfig ]; + + makeFlags = [ "prefix=$(out)" "verbose=yes" ]; + meta = { - description = "Framebuffer image viewing programs"; - maintainers = [ - ]; + description = "Image viewing and manipulation programs"; }; } |