diff options
4 files changed, 62 insertions, 20 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 7ff19af6673..0f814bd3829 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,5 @@ -{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript, -libjpeg, libpng, libtiff, libX11, libxml2, zlib}: -stdenv.mkDerivation { +args: with args; +(stdenv.mkDerivation ({ name = "ImageMagick-6.3.5"; src = fetchurl { @@ -9,8 +8,16 @@ stdenv.mkDerivation { }; configureFlags = " --with-dots --with-gs-font-dir="+ ghostscript + - "/share/ghostscript/fonts --with-gslib "; + "/share/ghostscript/fonts --with-gslib " +( + if args ? tetex then " --with-frozenpaths " else "" + ); buildInputs = [bzip2 freetype ghostscript graphviz libjpeg libpng - libtiff libX11 libxml2 zlib ]; -} + libtiff libX11 libxml2 zlib ] ++ (if args ? tetex then [args.tetex] else []) + ++ (if args ? librsvg then [args.librsvg] else []) + ; +} // (if args ? tetex then { + preConfigure = " + export DVIDecodeDelegate=${args.tetex}/bin/dvips + "; +} else {}))) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index fa6e123c45b..894da72b38f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -3,16 +3,20 @@ stdenv.mkDerivation { name = "pidgin-latex"; - src = fetchurl { - url = http://tapas.affenbande.org/pidgin-latex.tgz; - md5 = "12509b38f7a92bb22d565cc73cbd83c7"; - }; + src = + fetchurl { + url = http://tapas.affenbande.org/pidgin-latex/pidgin-latex-0.9.tgz; + sha256 = "1yqd3qgxd3n8hm60qg7yv7j1crr6f3d4yrdpgwdpw2pyf92p8nxp"; + }; - preBuild = "sed -e '/^PREFIX/d' -i Makefile ; - sed -e 's@/bin/bash@/var/run/current-system/sw&@; s@/dev/stdin@/proc/self/fd/0@' -i pidgin-latex-convert.sh; - sed -e 's@^latex.*@pdf& ; if let \$?; then rm /tmp/pidgin-latex-tmp.png; exit 1; fi; @' -i pidgin-latex-convert.sh ; - sed -e 's@[.]dvi@.pdf@' -i pidgin-latex-convert.sh; - "; + preBuild = " + sed -e '/^PREFIX/d' -i Makefile ; + sed -e 's@/usr/bin/latex@${tetex}/bin/pdflatex@g' -i pidgin-latex.h + sed -e 's@/usr/bin/convert@${imagemagick}/bin/convert@g' -i pidgin-latex.h + sed -e 's@.*convert_path.*@const gchar *convert = CONVERT_PATH;@' + sed -e 's@.*latex_path.*@const gchar *convert = LATEX_PATH;@' + sed -e 's/%s.dvi/%s.pdf/' -i pidgin-latex.c + "; makeFlags="PREFIX=\$(out)"; diff --git a/pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch b/pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch new file mode 100644 index 00000000000..2955819985b --- /dev/null +++ b/pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch @@ -0,0 +1,20 @@ +--- xorg-server-1.4/dix/devices.c.orig 2007-10-19 17:04:51.000000000 -0200 ++++ xorg-server-1.4/dix/devices.c 2007-10-23 17:50:38.000000000 -0200 +@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt + static void + CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl) + { ++#ifdef XKB ++ if (!noXkbExtension) { ++ DeviceIntPtr dev = (DeviceIntPtr) ++ pDev->devPrivates[CoreDevicePrivatesIndex].ptr; ++ ++ if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc) ++ (*dev->key->xkbInfo->kbdProc)(dev, ctrl); ++ } ++#else + return; ++#endif + } + + /** diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12d502dd2b4..6e22e0b443d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3654,7 +3654,8 @@ rec { }; pidginlatex = import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { - inherit fetchurl stdenv tetex pkgconfig imagemagick ghostscript pidgin; + inherit fetchurl stdenv tetex pkgconfig ghostscript pidgin; + imagemagick = imagemagickBig; inherit (gtkLibs) glib gtk; }; @@ -3722,12 +3723,22 @@ rec { inherit (xlibs) libX11 libXft libXext libXinerama libXrandr; }; - imagemagick = import ../applications/graphics/ImageMagick { - inherit stdenv fetchurl bzip2 freetype graphviz - ghostscript libjpeg libpng libtiff libxml2 zlib; - inherit (xlibs) libX11; + imagemagickFun = lib.sumArgs (import ../applications/graphics/ImageMagick) { + inherit stdenv fetchurl; }; + imagemagick = imagemagickFun { + inherit bzip2 freetype graphviz ghostscript libjpeg libpng libtiff + libxml2 zlib; + inherit (xlibs) libX11; + } null; + + imagemagickBig = imagemagickFun { + inherit bzip2 freetype graphviz ghostscript libjpeg libpng libtiff + libxml2 zlib tetex librsvg; + inherit (xlibs) libX11; + } null; + inkscape = import ../applications/graphics/inkscape { inherit fetchurl perl perlXMLParser pkgconfig zlib popt libxml2 libxslt libpng boehmgc fontconfig gtkmm |