* 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

1 files changed, 6 insertions, 11 deletions

diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index ee99a173b6f..681453985b9 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, librdf_raptor, gmp, pkgconfig, pcre, libxml2 }:
+
 stdenv.mkDerivation rec {
   name = "rasqal-0.9.19";
 
@@ -7,23 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "a042846e8b7af52d9d66fba788c9d579e58c535cfaf80d33dc0bd69bf6ffeb08";
   };
 
-  buildInputs = [
-    librdf_raptor
-    gmp /*or mpfr*/
-    pkgconfig
-    #optional
-    pcre libxml2 
-    ];
+  buildInputs = [ librdf_raptor gmp /*or mpfr*/ pkgconfig pcre libxml2 ];
 
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lraptor"
   '';
 
   meta = { 
-    description = "library that handles Resource Description Framework (RDF)";
+    description = "Library that handles Resource Description Framework (RDF)";
     homepage = "http://librdf.org/rasqal";
     license = "LGPL-2.1 Apache-2.0";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }