MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

* fbida: fix a segfault in exiftran.

Browse source 
svn path=/nixpkgs/trunk/; revision=25588
This commit is contained in:
Eelco Dolstra 2011-01-16 16:28:08 +00:00
parent 40012b3588
commit dbb8c452bb
2 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkgs/applications/graphics/fbida/default.nix
View file

@ -1,34 +1,29 @@
a : { stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng
let , pkgconfig, freetype, fontconfig
fetchurl = a.fetchurl; }:
version = a.lib.attrByPath ["version"] "2.07" a; stdenv.mkDerivation rec {
buildInputs = with a; [ name = "fbida-2.07";
libjpeg libexif giflib libtiff libpng
imagemagick ghostscript which curl
pkgconfig freetype fontconfig
];
in
rec {
src = fetchurl { 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"; sha256 = "0i6v3fvjc305pfw48sglb5f22lwxldmfch6mjhqbcp7lqkkxw435";
}; };
inherit buildInputs; patches =
configureFlags = []; [ # Fetch a segfault in exiftran (http://bugs.gentoo.org/284753).
makeFlags = [ (fetchurl {
"prefix=$out" url = http://bugs.gentoo.org/attachment.cgi?id=203930;
"verbose=yes" sha256 = "0zwva6qbahjdzk7vaw7cn3mj0326kawqw58rspvrz9m4vw5kqdzj";
})
]; ];
/* doConfigure should be removed if not needed */ buildInputs =
phaseNames = ["doMakeInstall" (a.doPatchShebangs "$out/bin")]; [ pkgconfig libexif libjpeg giflib libpng giflib freetype fontconfig ];
name = "fbida-" + version; makeFlags = [ "prefix=$(out)" "verbose=yes" ];
meta = { meta = {
description = "Framebuffer image viewing programs"; description = "Image viewing and manipulation programs";
maintainers = [
];
}; };
} }

6
pkgs/top-level/all-packages.nix
View file

@ -5893,11 +5893,7 @@ let
wvdial = callPackage ../os-specific/linux/wvdial { }; wvdial = callPackage ../os-specific/linux/wvdial { };
fbida = builderDefsPackage ../applications/graphics/fbida { fbida = callPackage ../applications/graphics/fbida { };
inherit libjpeg libexif giflib libtiff libpng
imagemagick ghostscript which curl pkgconfig
freetype fontconfig;
};
fdupes = callPackage ../tools/misc/fdupes { }; fdupes = callPackage ../tools/misc/fdupes { };