From 66097104090e06c43a784193809bc8843a2ec052 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Jul 2010 11:55:54 +0000
Subject: * Get rid of many instances of "args: with args;", and other coding  
 guidelines violations. * Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
---
 pkgs/data/fonts/ucs-fonts/default.nix | 62 +++++++++++++++++------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'pkgs/data/fonts/ucs-fonts')

diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index 4901c7486c3..1d2aa5e62d3 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -1,38 +1,38 @@
-args: with args;
+{ stdenv, fetchurl, wrapFonts }:
+
 let
 
-srcA=
-	fetchurl {
-		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz;
-		sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh";
-	};
-srcB=
-	fetchurl {
-		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz;
-		sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51";
-	};
-srcC=
-	fetchurl {
-		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz;
-		sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh";
-	};	
+  srcA = fetchurl {
+    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz;
+    sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh";
+  };
+  
+  srcB = fetchurl {
+    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz;
+    sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51";
+  };
+  
+  srcC = fetchurl {
+    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz;
+    sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh";
+  };  
 
 in
-wrapFonts (stdenv.mkDerivation {
 
-	name = "ucs-fonts";
-	phases = ["installPhase"];
-	installPhase = ''
-		tar xf ${srcA}
-		tar xf ${srcB}
-		tar xf ${srcC}
-		mkdir -p $out/share/fonts/ucs-fonts
-		cp *.bdf $out/share/fonts/ucs-fonts
-	'';
+wrapFonts (stdenv.mkDerivation {
+  name = "ucs-fonts";
+  
+  phases = ["installPhase"];
+  
+  installPhase = ''
+    tar xf ${srcA}
+    tar xf ${srcB}
+    tar xf ${srcC}
+    mkdir -p $out/share/fonts/ucs-fonts
+    cp *.bdf $out/share/fonts/ucs-fonts
+  '';
 
-	meta = {
-		description = "Unicode bitmap fonts";
-		src = [srcA srcB srcC];
-	};
+  meta = {
+    description = "Unicode bitmap fonts";
+  };
 })
-
-- 
cgit 1.4.1