diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
commit | 66097104090e06c43a784193809bc8843a2ec052 (patch) | |
tree | 021d726cde3c2dec5d4341340b37589feef3b15c /pkgs/development/compilers/fpc/default.nix | |
parent | b4a3f99c7812a6c8bc34979200693b7010afffcc (diff) | |
download | nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.gz nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.bz2 nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.lz nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.xz nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.zst nixpkgs-66097104090e06c43a784193809bc8843a2ec052.zip |
* 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
Diffstat (limited to 'pkgs/development/compilers/fpc/default.nix')
-rw-r--r-- | pkgs/development/compilers/fpc/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index ce1f101b4f5..ee2aa27a621 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);})) |