diff options
author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-03-27 17:29:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-27 17:29:27 +0200 |
commit | 048724c4affebacbc4bd40d1a667ba6a7551fdd0 (patch) | |
tree | dacdd120eec44e8dbaac6cdfdfb73fe201eabfda /pkgs/development/tools/godot/default.nix | |
parent | aacd7d6d58fd2cc6108e914a87c6aa419c5361dd (diff) | |
parent | 9508150198c2d02b4b674eecd06834fd049639e0 (diff) | |
download | nixpkgs-048724c4affebacbc4bd40d1a667ba6a7551fdd0.tar nixpkgs-048724c4affebacbc4bd40d1a667ba6a7551fdd0.tar.gz nixpkgs-048724c4affebacbc4bd40d1a667ba6a7551fdd0.tar.bz2 nixpkgs-048724c4affebacbc4bd40d1a667ba6a7551fdd0.tar.lz nixpkgs-048724c4affebacbc4bd40d1a667ba6a7551fdd0.tar.xz nixpkgs-048724c4affebacbc4bd40d1a667ba6a7551fdd0.tar.zst nixpkgs-048724c4affebacbc4bd40d1a667ba6a7551fdd0.zip |
Merge pull request #34971 from Twey/master
godot: 2.1.4 -> 3.0 + godot_headers
Diffstat (limited to 'pkgs/development/tools/godot/default.nix')
-rw-r--r-- | pkgs/development/tools/godot/default.nix | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 1ea4d160b4c..e89b2f62b15 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,41 +1,54 @@ -{ stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor -, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib -, libpulseaudio, libGLU, zlib }: - -stdenv.mkDerivation rec { +{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor +, libXinerama, libXrandr, libXrender, libpulseaudio ? null +, libXi ? null, libXext, libXfixes, freetype, openssl +, alsaLib, libGLU, zlib, yasm ? null }: + +let + options = { + touch = libXi != null; + pulseaudio = false; + }; +in stdenv.mkDerivation rec { name = "godot-${version}"; - version = "2.1.4"; + version = "3.0.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "0d2zczn5k7296sky5gllq55cxd586nx134y2iwjpkqqjr62g0h48"; + sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender - freetype openssl alsaLib libpulseaudio libGLU zlib + scons libX11 libXcursor libXinerama libXrandr libXrender + libXi libXext libXfixes freetype openssl alsaLib libpulseaudio + libGLU zlib yasm ]; - patches = [ ./pkg_config_additions.patch ]; + patches = [ + ./pkg_config_additions.patch + ./dont_clobber_environment.patch + ]; enableParallelBuilding = true; buildPhase = '' - scons platform=x11 prefix=$out -j $NIX_BUILD_CORES + scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \ + ${lib.concatStringsSep " " + (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)} ''; installPhase = '' - mkdir $out/bin -p - cp bin/godot.* $out/bin/ + mkdir -p $out/bin + cp bin/godot.x11.tools.* $out/bin/godot ''; meta = { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.twey ]; }; } |