Author: eelco
Date: Sun Jan 16 16:39:06 2011
New Revision: 25589
URL: https://svn.nixos.org/websvn/nix/?rev=25589&sc=1
Log:
* And now an actual fix.
Modified:
nixpkgs/trunk/pkgs/applications/graphics/fbida/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/fbida/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/fbida/default.nix Sun Jan 16
16:28:08 2011 (r25588)
+++ nixpkgs/trunk/pkgs/applications/graphics/fbida/default.nix Sun Jan 16
16:39:06 2011 (r25589)
@@ -10,13 +10,17 @@
sha256 = "0i6v3fvjc305pfw48sglb5f22lwxldmfch6mjhqbcp7lqkkxw435";
};
- patches =
- [ # Fetch a segfault in exiftran (http://bugs.gentoo.org/284753).
- (fetchurl {
- url = http://bugs.gentoo.org/attachment.cgi?id=203930;
- sha256 = "0zwva6qbahjdzk7vaw7cn3mj0326kawqw58rspvrz9m4vw5kqdzj";
- })
- ];
+ preBuild =
+ ''
+ # Fetch a segfault in exiftran (http://bugs.gentoo.org/284753).
+ # `fbida' contains a copy of some internal libjpeg source files.
+ # If these do not match with the actual libjpeg, exiftran may
+ # fail.
+ tar xvf ${libjpeg.src}
+ for i in jpegint.h jpeglib.h jinclude.h transupp.c transupp.h; do
+ cp jpeg-*/$i jpeg/
+ done
+ '';
buildInputs =
[ pkgconfig libexif libjpeg giflib libpng giflib freetype fontconfig ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
