Update FPC and Lazarus

svn path=/nixpkgs/trunk/; revision=16343
This commit is contained in:
Michael Raskin 2009-07-14 09:08:05 +00:00
parent 2ec77fdc7e
commit cf03c27fb7
2 changed files with 10 additions and 8 deletions

View File

@ -4,12 +4,13 @@ if args ? startFPC && args.startFPC != null then
with args; with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "fpc-2.2.2"; version = "2.2.4";
name = "fpc-${version}";
src = fetchurl { src = fetchurl {
url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.2/fpcbuild-2.2.2.tar.gz; url = "http://downloads.sourceforge.net/sourceforge/freepascal/fpcbuild-${version}.tar.gz";
sha256 = "0d73b119e029382052fc6615034c4b5ee3ec66fa6cc45648f1f07cfb2c1058f1"; sha256 = "1kxljnivww4riqff8vxann7s135cv634ly3i61rfs1wzwc4lz9bp";
}; };
buildInputs = [startFPC gawk]; buildInputs = [startFPC gawk];
@ -26,7 +27,7 @@ stdenv.mkDerivation {
postInstall = '' postInstall = ''
ln -fs $out/lib/fpc/*/ppc386 $out/bin ln -fs $out/lib/fpc/*/ppc386 $out/bin
mkdir -p $out/lib/fpc/etc/ mkdir -p $out/lib/fpc/etc/
$out/lib/fpc/*/samplecfg $out/lib/fpc/2.2.0 $out/lib/fpc/etc/ $out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
''; '';
meta = { meta = {

View File

@ -1,8 +1,9 @@
args : with args; args : with args;
rec { rec {
version = "0.9.26.2-0";
src = fetchurl { src = fetchurl {
url = http://downloads.sourceforge.net/lazarus/lazarus-0.9.26-0.tgz; url = "http://downloads.sourceforge.net/lazarus/lazarus-${version}.tgz";
sha256 = "1pb6h35axdmg552pvazgi7jclkx93vssy08cbpa4jw3rij7drhnl"; sha256 = "5b582685c0447034580fe17c60b8fc84a8b097b6f31ff9b4583cf0eb741297cc";
}; };
buildInputs = [fpc gtk glib libXi inputproto buildInputs = [fpc gtk glib libXi inputproto
@ -31,7 +32,7 @@ rec {
wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'"
'') ["doMakeInstall" "minInit" "defEnsureDir"]; '') ["doMakeInstall" "minInit" "defEnsureDir"];
name = "lazarus-0.9.26-0"; name = "lazarus-${version}";
meta = { meta = {
description = "Lazarus graphical IDE for FreePascal language"; description = "Lazarus graphical IDE for FreePascal language";
homepage = http://www.lazarus.freepascal.org ; homepage = http://www.lazarus.freepascal.org ;