* 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

2 files changed, 17 insertions, 20 deletions

diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix
index fadc73c051ef..88f0ab910672 100644
--- a/pkgs/development/compilers/fpc/binary.nix
+++ b/pkgs/development/compilers/fpc/binary.nix
@@ -1,19 +1,20 @@
-args: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "fpc-2.4.0-binary";
 
-  src = if stdenv.system == "i686-linux" then
-  fetchurl {
-    url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar";
-    sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv";
-  }
-  else if stdenv.system == "x86_64-linux" then
-  fetchurl {
-    url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar";
-    sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z";
-  }
-  else null;
+  src =
+    if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar";
+        sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv";
+      }
+    else if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar";
+        sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z";
+      }
+    else throw "Not supported on ${stdenv.system}.";
 
   builder = ./binary-builder.sh;
 
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index ce1f101b4f56..ee2aa27a621b 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -1,8 +1,6 @@
-args:
+{ stdenv, fetchurl, gawk }:
 
-if args ? startFPC && args.startFPC != null then
-
-with args;
+let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
 stdenv.mkDerivation rec {
   version = "2.4.0";
@@ -13,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1m2g2bafjixbwl5b9lna5h7r56y1rcayfnbp8kyjfd1c1ymbxaxk";
   };
 
-  buildInputs = [startFPC gawk];
+  buildInputs = [ startFPC gawk ];
 
   preConfigure =
-    if system == "i686-linux" || system == "x86_64-linux" then ''
+    if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then ''
       sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
     '' else "";
 
@@ -38,5 +36,3 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
-
-else (import ./default.nix (args // {startFPC = (import ./binary.nix args);}))