From 8e38efac32e6a72da0b32702d2a2278569d33306 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 4 Oct 2012 10:37:54 +0400
Subject: [PATCH] Update/fix MuPDF

---
 pkgs/applications/misc/mupdf/default.nix       |   7 ++++---
 pkgs/os-specific/linux/reptyr/.default.nix.swp | Bin 12288 -> 0 bytes
 2 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/reptyr/.default.nix.swp

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 20ded9486f77..eccd11f6041a 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
 , libX11, libXext }:
 stdenv.mkDerivation rec {
-  name = "mupdf-0.7";
+  name = "mupdf-1.1";
 
   src = fetchurl {
-    url = "http://mupdf.com/download/archive/${name}.tar.gz";
-    sha256 = "e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6";
+    url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
+    sha256 = "e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34";
   };
 
   buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
 
   preBuild = ''
     export makeFlags="prefix=$out"
+    export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) "
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/reptyr/.default.nix.swp b/pkgs/os-specific/linux/reptyr/.default.nix.swp
deleted file mode 100644
index eb6aba8e0b7cb9c77ff5b78b221c6d953af468db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2O>5LZ7{{mHt5%O*#_hr?*u3qw>5DxGS|})#LPaPZCX*+duz6!<cCD<7-=N>Y
zuOWgbFCIOM7r~2u2%kyPQarTh$`km{B=h{|nVDZsAy4GJ+<(DCXUOon&Dhs_#lfdl
zpB-*6ri7kkr43wujXYm?QQ}|jV$4me0$c@krQI?+sV8IYHch41bPX~~GU?`7IX$r^
z^H#YrBx0Hy2i;dCr#KNH0#^`NX2ZbutZB7(pWnT6bcLV7M1Tko0U|&IhyW2F0z`la
z{7(c-y~N(*fo^n%TIu?wfBNo`IwC*>hyW2F0z`la5CI}U1c(3;AOb|-8WIpOWABz3
z`;M~z|Ifbv|J-8i8|pLa1L_oYjCzdveUq_Ys4u9Gs8iGt%0d0aJU`CzT|*wUWg<WX
zhyW2F0z`la5CI}U1c<<OB(PwdFLtouJO(XQR-3FU`7R#}p77_k&YGL5%CX@x73CPX
ztV*M*9BZ)091E~{m2kmpRY}l#FlbZdnS@dUrqL#ba^~b&glY!0Q)H&K6(TDQ3Y13c
zo6Mva{THG;{J1SNf89>3b77K76?WQ%70!ooE!?^F7GMOL=Jr-hU@sSAJL$N0aQJL*
z|J82)K{YiGdrjVsgHA=TzJaD*5C@z7NMboGjG`DelC4N4Lm>ih6o$cO7>6(t>q3M8
z-j?rs(J+hy5F!a-9i)I>yITb_n@vHYU4!ep{dp-0Sajj3%569`rq<i8J4OuC$dOgy
zmXN1n+?2y(rMrWXW{Or4CnR8GibKuWY`%64TNA(5pU;pfzQ}fs?!g*7XM{OAX2s+w
WsB9*hSFS)}s(BlFbe?{(&He(J%;9?g