From 56ea89a61e191d7e57b90ebbe7253d0846780168 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Jan 2011 16:39:06 +0000
Subject: [PATCH] * And now an actual fix.

svn path=/nixpkgs/trunk/; revision=25589
---
 pkgs/applications/graphics/fbida/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index 65f5cdb2a36d..ea7cb81a48e5 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -10,13 +10,17 @@ stdenv.mkDerivation rec {
     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 ];