* And now an actual fix.

svn path=/nixpkgs/trunk/; revision=25589

1 files 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 ];