Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d0335875f110
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 638216c3928f
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 23, 2019

  1. stuntrally: 2.6 -> 2.6.1 

    (cherry picked from commit ad73d46)
    @pSub
    pSub committed Mar 23, 2019
    Copy the full SHA
    638216c View commit details
Showing with 4 additions and 75 deletions.
  1. +4 −8 pkgs/games/stuntrally/default.nix
  2. +0 −67 pkgs/games/stuntrally/gcc6.patch
12 changes: 4 additions & 8 deletions pkgs/games/stuntrally/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,16 +3,16 @@

stdenv.mkDerivation rec {
name = "stunt-rally-${version}";
version = "2.6";
version = "2.6.1";

src = fetchurl {
url = "https://github.com/stuntrally/stuntrally/archive/${version}.tar.gz";
sha256 = "1jmsxd2isq9q5paz43c3xw11vr5md1ym8h34b768vxr6gp90khwc";
sha256 = "1zxq3x2g9pzafa2awx9jzqd33z6gnqj231cs07paxzrm89y51w4v";
};

tracks = fetchurl {
url = "https://github.com/stuntrally/tracks/archive/${version}.tar.gz";
sha256 = "0yv88l9s03kp1xkkwnigh0jj593vi3r7vgyg0jn7i8d22q2p1kjb";
sha256 = "0x6lgpa4c2grl0vrhqrcs7jcysa3mmvpdl1v5xa0dsf6vkvfr0zs";
};

# include/OGRE/OgreException.h:265:126: error: invalid conversion from
@@ -22,14 +22,10 @@ stdenv.mkDerivation rec {
preConfigure = ''
pushd data
tar xf ${tracks}
mv tracks-2.6 tracks
mv tracks-${version} tracks
popd
'';

patches = [
./gcc6.patch
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis
makeWrapper enet libXcursor bullet openal
67 changes: 0 additions & 67 deletions pkgs/games/stuntrally/gcc6.patch
View file

This file was deleted.