Minor updates

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

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix

@@ -16,6 +16,7 @@ stdenv.mkDerivation {
 	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
+	sed -e 's/latex_system\(.*\)FALSE/latex_system\1TRUE/' -i pidgin-latex.c
   ";
 
   makeFlags="PREFIX=\$(out)";

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix

@@ -0,0 +1,32 @@
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://mesh.dl.sourceforge.net/sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2;
+    sha256 = "19h76fwsx5y30l5wda2930k10r385aipngfljz5bdi7b9y52lii7";
+  };
+
+  buildInputs = [texLive pkgconfig gtk imagemagick glib pidgin which];
+  configureFlags = [];
+  installFlags = [
+    "PREFIX=$out"
+  ];
+
+  preBuild = FullDepEntry (''
+    ensureDir $out/lib
+    ensureDir $out/bin
+    ensureDir $out/share/pidgin/pidgin-latex
+    ln -s $(which convert) $out/bin
+    ln -s $(which latex) $out/bin
+    ln -s $(which dvips) $out/bin
+    ln -s ../../../lib/LaTeX.so  $out/share/pidgin/pidgin-latex 
+  '') ["minInit" "addInputs" "defEnsureDir"];
+
+  /* doConfigure should be specified separately */
+  phaseNames = [ "preBuild" "doMakeInstall"];
+      
+  name = "pidgin-latex-1.2.1";
+  meta = {
+    description = "LaTeX rendering plugin for Pidgin IM";
+    priority = "10";
+  };
+}

pkgs/os-specific/linux/atheros/0.9.4.nix

@@ -0,0 +1,30 @@
+args : with args;
+	let localDefs = builderDefs {
+		src = /* put a fetchurl here */
+		fetchurl {
+		  url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz;
+		  sha256 = "06jd5b8rfw7rmiva6jgmrb7n26g5plcg9marbnnmg68gbcqbr3xh";
+		};
+
+		buildInputs = [];
+		configureFlags = [];
+		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
+	} null; /* null is a terminator for sumArgs */
+	in with localDefs;
+let 
+postInstall = FullDepEntry (''
+	ln -s $out/usr/local/bin $out/bin
+'') [minInit doMakeInstall];
+in
+stdenv.mkDerivation rec {
+	name = "atheros-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [doMakeInstall 
+			postInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+		Atheros WiFi driver.
+";
+		inherit src;
+	};
+}

pkgs/os-specific/linux/blcr/0.6.5.nix

@@ -12,8 +12,13 @@ rec {
     "--with-system-map=${kernel}/System.map"
   ];
 
+  preConfigure = FullDepEntry (''
+    sed -e 's/FASTCALL//' -i configure configure.ac
+    sed -e 's/int (attach_pid/void (attach_pid/' -i configure configure.ac
+  '')["doUnpack" "minInit"];
+
   /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
       
   name = "blcr-" + version;
   meta = {

pkgs/top-level/all-packages.nix

@@ -3957,7 +3957,7 @@ let pkgs = rec {
 
   alsaUtils = alsa.alsaUtils;
 
-  atherosFun = lib.sumArgs (selectVersion ../os-specific/linux/atheros "r3122") {
+  atherosFun = lib.sumArgs (selectVersion ../os-specific/linux/atheros "0.9.4") {
     inherit fetchurl stdenv builderDefs;
   };
 
@@ -5258,6 +5258,14 @@ let pkgs = rec {
   };
   pidginlatex = pidginlatexFun null;
 
+  pidginlatexSFFun = builderDefsPackage 
+    (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix) 
+    {
+      inherit pkgconfig pidgin texLive imagemagick which;
+      inherit (gtkLibs) glib gtk;
+    };
+  pidginlatexSF = pidginlatexSFFun null;
+
   pidginotr = import ../applications/networking/instant-messengers/pidgin-plugins/otr {
     inherit fetchurl stdenv libotr pidgin;
   };