godot: 2.1.3 -> 2.1.4

When I tested this locally I had already merged in
pull #31587.

fixes #31588 #31587
This commit is contained in:
Jason Hilton 2017-11-13 05:32:06 +00:00 committed by Joerg Thalheim
parent d7e84159f8
commit 61b20e2415

View File

@ -1,21 +1,21 @@
{ stdenv, fetchFromGitHub, gcc, scons, pkgconfig, libX11, libXcursor { stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor
, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib
, libpulseaudio, mesa_glu, zlib }: , libpulseaudio, mesa_glu, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "godot-${version}"; name = "godot-${version}";
version = "2.1.3-stable"; version = "2.1.4-stable";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "godotengine"; owner = "godotengine";
repo = "godot"; repo = "godot";
rev = version; rev = version;
sha256 = "04qbab0icpv3ascr4dqgj18sqvw04a1jypcngb0ji8npa8q9wxb2"; sha256 = "0d2zczn5k7296sky5gllq55cxd586nx134y2iwjpkqqjr62g0h48";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gcc scons libX11 libXcursor libXinerama libXrandr libXrender gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender
freetype openssl alsaLib libpulseaudio mesa_glu zlib freetype openssl alsaLib libpulseaudio mesa_glu zlib
]; ];