* 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
This commit is contained in:
Eelco Dolstra
2010-07-28 11:55:54 +00:00
parent b4a3f99c78
commit 6609710409
132 changed files with 925 additions and 958 deletions
+13 -12
View File
@@ -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;