Unverified Commit bd119f44 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #145657 from dunklecat/master

godot: 3.3.3 -> 3.4
parents cf0e83f5 8f5073b5
Loading
Loading
Loading
Loading
+53 −21
Original line number Diff line number Diff line
{ stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11
, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio
, libXi, libXext, libXfixes, freetype, openssl
, alsa-lib, libGLU, zlib, yasm
{ stdenv
, lib
, fetchFromGitHub
, scons
, pkg-config
, udev
, libX11
, libXcursor
, libXinerama
, libXrandr
, libXrender
, libpulseaudio
, libXi
, libXext
, libXfixes
, freetype
, openssl
, alsa-lib
, libGLU
, zlib
, yasm
, withUdev ? true
}:

@@ -11,34 +28,49 @@ let
    pulseaudio = false;
    udev = withUdev;
  };
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
  pname = "godot";
  version = "3.3.3";
  version = "3.4";

  src = fetchFromGitHub {
    owner = "godotengine";
    repo = "godot";
    rev = "${version}-stable";
    sha256 = "0bkng0iwsfawxk8bxlq01ib4n6kaxjkbwcif1bhpvw5ra19430rg";
    sha256 = "0y542zla6msgxf31rd0349d9j3ya7f3njnwmmrh8lmzfgxx86qbx";
  };

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
    scons udev libX11 libXcursor libXinerama libXrandr libXrender
    libXi libXext libXfixes freetype openssl alsa-lib libpulseaudio
    libGLU zlib yasm
    scons
    udev
    libX11
    libXcursor
    libXinerama
    libXrandr
    libXrender
    libXi
    libXext
    libXfixes
    freetype
    openssl
    alsa-lib
    libpulseaudio
    libGLU
    zlib
    yasm
  ];

  patches = [
    ./pkg_config_additions.patch
    ./dont_clobber_environment.patch
  ];
  patches = [ ./pkg_config_additions.patch ./dont_clobber_environment.patch ];

  enableParallelBuilding = true;

  sconsFlags = "target=release_debug platform=x11";
  preConfigure = ''
    sconsFlags+=" ${lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}"
    sconsFlags+=" ${
      lib.concatStringsSep " "
      (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)
    }"
  '';

  outputs = [ "out" "dev" "man" ];