vdrift: fix build, allow parallel building

VDrift previously failed to build on gcc 6. This isn't fixed in any
released version (I don't think the last released version being from
2014 helps), but the latest git version at least builds.
This commit is contained in:
Linus Heckemann 2017-12-26 11:07:28 +01:00
parent 9708ae00cd
commit 198dfac8bb

View file

@ -2,14 +2,14 @@
bullet, curl, gettext }: bullet, curl, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2014-10-20"; version = "git";
name = "vdrift-${version}"; name = "vdrift-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VDrift"; owner = "vdrift";
repo = "vdrift"; repo = "vdrift";
rev = version; rev = "12d444ed18395be8827a21b96cc7974252fce6d1";
sha256 = "09yny5qzdrpffq3xhqwfymsracwsxwmdd5xa8bxx9a56hhxbak2l"; sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg";
}; };
data = fetchsvn { data = fetchsvn {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
chmod -R +w data chmod -R +w data
sed -i -e s,/usr/local,$out, SConstruct sed -i -e s,/usr/local,$out, SConstruct
export CXXFLAGS="$(pkg-config --cflags SDL2_image)" export CXXFLAGS="$(pkg-config --cflags SDL2_image)"
scons scons -j$NIX_BUILD_CORES
''; '';
installPhase = "scons install"; installPhase = "scons install";