Merge pull request #31245 from pbogdan/openrct2-fix-build

openrct2: fix build
This commit is contained in:
Tim Steinbach 2017-11-04 10:52:06 -04:00 committed by GitHub
commit b7fe5577e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -24,8 +24,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit name; inherit name;
srcs = [ openrct2-src title-sequences-src ]; src = openrct2-src;
sourceRoot = ".";
buildInputs = [ buildInputs = [
SDL2 SDL2
@ -46,11 +45,7 @@ stdenv.mkDerivation rec {
]; ];
postUnpack = '' postUnpack = ''
cp -r ${openrct2-src}/* ${sourceRoot} cp -r ${title-sequences-src} $sourceRoot/title
cp -r ${title-sequences-src} ${sourceRoot}/title
# creating temporary files in fixCmakeFiles fails otherwise
chmod -R u+w ${sourceRoot}
''; '';
cmakeFlags = [ cmakeFlags = [