From 11aceede25573357f562a80fd83ee7875da2f52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 Feb 2012 22:39:23 +0000 Subject: [PATCH] Downgrading rigsofrods to a version that might work, where cars may run fast. This rev should be very close to the stablest 0.38. I had to bring an old angelscript in. svn path=/nixpkgs/trunk/; revision=32635 --- .../interpreters/angelscript/2.20.nix | 65 +++++++++++++++++++ pkgs/games/rigsofrods/default.nix | 9 +-- pkgs/top-level/all-packages.nix | 3 + 3 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/interpreters/angelscript/2.20.nix diff --git a/pkgs/development/interpreters/angelscript/2.20.nix b/pkgs/development/interpreters/angelscript/2.20.nix new file mode 100644 index 00000000000..78225a1b542 --- /dev/null +++ b/pkgs/development/interpreters/angelscript/2.20.nix @@ -0,0 +1,65 @@ +x@{builderDefsPackage + , unzip + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="angelscript"; + version="2.20.3"; + name="${baseName}-${version}"; + url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; + hash="1gyfi35n7vcm9bm0f1q3va4w8b94avc713b6yqzinzg6dmp1x937"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["prepareBuild" "doMake" "cleanLib" "doMakeInstall" "installDocs"]; + + prepareBuild = a.fullDepEntry '' + cd angelscript/projects/gnuc + sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@" + ensureDir "$out/lib" "$out/bin" "$out/share" "$out/include" + export SHARED=1 + export VERSION="${version}" + '' ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; + + cleanLib = a.fullDepEntry '' + rm ../../lib/* + '' ["minInit"]; + + installDocs = a.fullDepEntry '' + ensureDir "$out/share/angelscript" + cp -r ../../../docs "$out/share/angelscript" + '' ["defEnsureDir" "prepareBuild"]; + + meta = { + description = "A light-weight scripting library"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.zlib; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.angelcode.com/angelscript/downloads.asp"; + }; + }; +}) x + diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 4fa89798306..e7f2b3976cd 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -4,12 +4,13 @@ }: stdenv.mkDerivation rec { - version = "0.39.4"; + version = "0.39-svn2267"; name = "rigsofrods-${version}"; - src = fetchurl { - url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2; - sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx"; + src = fetchsvn { + url = https://rigsofrods.svn.sourceforge.net/svnroot/rigsofrods/trunk; + rev = 2267; + sha256 = "19r3v6x1wk3nb1cyixbp1bmdg96h31bxjlsz6zh6qc317wjmy96b"; }; contentPackSrc = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 802904b1903..af83e765f74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2620,6 +2620,8 @@ let angelscript = callPackage ../development/interpreters/angelscript {}; + angelscript_2_20 = callPackage ../development/interpreters/angelscript/2.20.nix {}; + clisp = callPackage ../development/interpreters/clisp { }; # compatibility issues in 2.47 - at list 2.44.1 is known good @@ -7961,6 +7963,7 @@ let rigsofrods = callPackage ../games/rigsofrods { mygui = myguiSvn; + angelscript = angelscript_2_20; }; rogue = callPackage ../games/rogue { };