forked from mirrors/nixpkgs
Merge pull request #176001 from NixOS/update-and-fix-stuntrally
stuntrally: 2.6.1 -> 2.6.2
This commit is contained in:
commit
48195904d5
|
@ -18,25 +18,21 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stunt-rally";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stuntrally";
|
||||
repo = "stuntrally";
|
||||
rev = version;
|
||||
hash = "sha256-1+Cc9I6TTa3b++/7Z2V+vAXcmFb2+wX7TnXEH6CRDWU=";
|
||||
hash = "sha256-9I6hXsosqx+yYiEOEnPXQJHZkGtSU+JqThorwjemlc0=";
|
||||
};
|
||||
tracks = fetchFromGitHub {
|
||||
owner = "stuntrally";
|
||||
repo = "tracks";
|
||||
rev = version;
|
||||
hash = "sha256-FbZc87j/9cp4LxNaEO2wNTvwk1Aq/IWcKD3rTGkzqj0=";
|
||||
hash = "sha256-eZJAvkKe3PrXDzxTa5WFBHfltB3jhQh8puzOFDO9lso=";
|
||||
};
|
||||
|
||||
# include/OGRE/OgreException.h:265:126: error: invalid conversion from
|
||||
# 'int' to 'Ogre::Exception::ExceptionCodes' [-fpermissive]
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
|
||||
preConfigure = ''
|
||||
ln -s ${tracks} data/tracks
|
||||
'';
|
||||
|
|
|
@ -32285,7 +32285,7 @@ with pkgs;
|
|||
stt = callPackage ../tools/audio/stt { };
|
||||
|
||||
stuntrally = callPackage ../games/stuntrally
|
||||
{ stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
|
||||
{ ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
|
||||
|
||||
superTux = callPackage ../games/supertux { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue