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 20ded9486f7..eccd11f6041 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
zcmYc?2=nw+FxN9?U|?VnU|={Uog1)6*^nW~jDevju{b+34<vyfn-~}-8YHC|;#bAM
zpr4VSo2p-wT999?pO;xtkeyzv4<_=9b&Cs9lQYvYll5~l^GYi~ib^Vr^ixvP5=(PR
z^zt$*2pK*qKN<p~AwVDmco~e13=Kevl$8_}goQ#u%uzfV0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?LPDUVfRUk|fq{Vu>R&-9&4@-rxueu*2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQJUEfy5LBh8kW5hC95F`F~jd{|!F_!zF$OhW-2u3=8=g82b1b
z7^3+Z7;N|%7+&)+Fg)X9U^vRhz_5#tfuWC&fgzNSfkBUtf#ESP1H(O-c|$NfMx8tw
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UjNx1Zo)+6l$#*6ciK`Qc{bPi!uvJGV}8k
zY!%ei9Tj{)>#P+@^7C^PO7azwGZORCQx%f)^Gb^Hb8<5C(iI9yDi!k66cQB*it>|F
zi;LCOAx7n7Ca2~Vrz+Sg6qlr==9TH?WG3lB1&j4^GfN=KauYN2N)j{kQj3ZeY!%8g
zOEQqvBgtATL_-#u$3ip~<Rq4)<rn3Gv?1957uEx>5C^HvO)W`OuvMsLP*BKC%uaR7
zNlXW6idG5;a&_~JuvO8>FD=nj0-FmBhvJMxBU3X4TLmSf6e9~mlVl@9gH)5GlvJ}c
z%cSHq<HSTG0~2#|BMb8s^Hh^W)5Jvc)KmjYLqmfkWAhZF)WpOz^HkH+<iu1ZkP8$P
zic-r!rWK{873-HIrWfn0ROcn;rq)8GON(+q(itTs1;tkS`stY^8Kp^j$@#hZd8s)W
ziRs|w@FkT+dg+-ZU@gT($qKd#X{ja28R?lNV84OP0~u13T2NA1q^nY0mReMtnV$!-
q1Ihs@FwiqmvSxsWS#GvVYEfocA~?#6Qj-;`8LA;tI&kA_tr!5A%;9?g