Nix-expr style review

Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
This commit is contained in:
Yury G. Kudryashov
2008-01-30 17:20:48 +00:00
parent f831e0420a
commit 5bca69ac34
53 changed files with 220 additions and 248 deletions

View File

@@ -1,9 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "fpc-2.0.4-binary";
src = args.
fetchurl {
src = fetchurl {
url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.0.4/fpc-2.0.4.i386-linux.tar;
sha256 = "0b2szv2anbf58h4i5mlph93afv9qdx6i0jqggba04d3anjbl9gfy";
};

View File

@@ -1,16 +1,16 @@
args:
if ((args ? startFPC) && (args.startFPC != null))
then
args.stdenv.mkDerivation {
with args;
stdenv.mkDerivation {
name = "fpc-2.2.0";
src = args.
fetchurl {
src = fetchurl {
url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.0/fpcbuild-2.2.0.tar.gz;
sha256 = "0pvsdmimknkgy8jgdz9kd7w5bs9fy5ynrgswpk0ib6x0y26zxijm";
};
buildInputs = [args.startFPC args.gawk];
buildInputs = [startFPC gawk];
installFlags = "INSTALL_PREFIX=\${out}";
postInstall = "ln -fs $out/lib/fpc/*/ppc386 $out/bin;