diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2009-02-26 15:14:17 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2009-02-26 15:14:17 +0000 |
commit | d6682c95149bd5efc8cdee5faf2f82654e219c11 (patch) | |
tree | ffe0722ab28e44a9efd4c7bac5a792c691bd48bf /pkgs/development/compilers/fpc | |
parent | 6a1ecaee9470b958bdc0513d6dae24cf1383ff2c (diff) | |
download | nixpkgs-d6682c95149bd5efc8cdee5faf2f82654e219c11.tar nixpkgs-d6682c95149bd5efc8cdee5faf2f82654e219c11.tar.gz nixpkgs-d6682c95149bd5efc8cdee5faf2f82654e219c11.tar.bz2 nixpkgs-d6682c95149bd5efc8cdee5faf2f82654e219c11.tar.lz nixpkgs-d6682c95149bd5efc8cdee5faf2f82654e219c11.tar.xz nixpkgs-d6682c95149bd5efc8cdee5faf2f82654e219c11.tar.zst nixpkgs-d6682c95149bd5efc8cdee5faf2f82654e219c11.zip |
Updated FPC. Patch partially by Felix Breuer
svn path=/nixpkgs/trunk/; revision=14261
Diffstat (limited to 'pkgs/development/compilers/fpc')
-rw-r--r-- | pkgs/development/compilers/fpc/binary.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/fpc/default.nix | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index 99725b501c0..1bda19faf93 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation { - name = "fpc-2.0.4-binary"; + name = "fpc-2.2.2-binary"; 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"; + url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.2.2/fpc-2.2.2.i386-linux.tar; + sha256 = "8c18f63b36a76eee673f96ca254c49c5a42bcf3e36279abe8774f961792449a5"; }; builder = ./binary-builder.sh; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 463907e0518..f13ea373418 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -3,11 +3,11 @@ if ((args ? startFPC) && (args.startFPC != null)) then with args; stdenv.mkDerivation { - name = "fpc-2.2.0"; + name = "fpc-2.2.2"; src = fetchurl { - url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.0/fpcbuild-2.2.0.tar.gz; - sha256 = "0pvsdmimknkgy8jgdz9kd7w5bs9fy5ynrgswpk0ib6x0y26zxijm"; + url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.2/fpcbuild-2.2.2.tar.gz; + sha256 = "0d73b119e029382052fc6615034c4b5ee3ec66fa6cc45648f1f07cfb2c1058f1"; }; buildInputs = [startFPC gawk]; @@ -16,6 +16,8 @@ stdenv.mkDerivation { sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""); + makeFlags = "NOGDB=1"; + installFlags = "INSTALL_PREFIX=\${out}"; postInstall = "ln -fs $out/lib/fpc/*/ppc386 $out/bin; mkdir -p $out/lib/fpc/etc/ ; |