mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Code Issues Wiki Activity

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

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

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