diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/stuntrally/default.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 26 insertions, 8 deletions
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 706fd23c65c65..af5535ec7ab6f 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -14,34 +14,50 @@ , libXcursor , bullet , openal +, tinyxml +, tinyxml-2 }: +let + stuntrally_ogre = ogre.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags ++ [ + "-DOGRE_NODELESS_POSITIONING=ON" + "-DOGRE_RESOURCEMANAGER_STRICT=0" + ]; + }); + stuntrally_mygui = mygui.override { + withOgre = true; + inherit ogre; + }; +in + stdenv.mkDerivation rec { - pname = "stunt-rally"; - version = "2.6.2"; + pname = "stuntrally"; + version = "2.7"; src = fetchFromGitHub { owner = "stuntrally"; repo = "stuntrally"; rev = version; - hash = "sha256-9I6hXsosqx+yYiEOEnPXQJHZkGtSU+JqThorwjemlc0="; + hash = "sha256-0Eh9ilIHSh/Uz8TuPnXxLQfy7KF7qqNXUgBXQUCz9ys="; }; tracks = fetchFromGitHub { owner = "stuntrally"; repo = "tracks"; rev = version; - hash = "sha256-eZJAvkKe3PrXDzxTa5WFBHfltB3jhQh8puzOFDO9lso="; + hash = "sha256-fglm1FetFGHM/qGTtpxDb8+k2iAREn5DQR5GPujuLms="; }; preConfigure = '' - ln -s ${tracks} data/tracks + rmdir data/tracks + ln -s ${tracks}/ data/tracks ''; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ boost - ogre - mygui + stuntrally_ogre + stuntrally_mygui ois SDL2 libvorbis @@ -49,6 +65,8 @@ stdenv.mkDerivation rec { libXcursor bullet openal + tinyxml + tinyxml-2 ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26da6522e8806..6335b9f721bfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35269,7 +35269,7 @@ with pkgs; stt = callPackage ../tools/audio/stt { }; stuntrally = callPackage ../games/stuntrally - { ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; }; + { }; superTux = callPackage ../games/supertux { }; |