Unverified Commit 4dae95a0 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #167029 from SFrijters/openttd-12.2

parents 64d12b6b 6fc9e4b7

pkgs/games/openttd/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ let 
in

stdenv.mkDerivation rec {

  pname = "openttd";

  version = "12.1";

  version = "12.2";



  src = fetchurl {

    url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";

    sha256 = "sha256-JYv1uZgwEIkLoQUYtQa8SrgPfAjM7FlJfpulWkqj5+M=";

    hash = "sha256-gVCPDek6DCZLIW71agX4OB//e/+m0BASGiFJC02s6Vw=";

  };



  nativeBuildInputs = [ cmake makeWrapper ];

pkgs/games/openttd/jgrpp.nix

+5 −3
Original line number Diff line number Diff line 
{ fetchFromGitHub, openttd, ... }:

{ fetchFromGitHub, openttd, zstd, ... }:



openttd.overrideAttrs (oldAttrs: rec {

  pname = "openttd-jgrpp";

  version = "0.44.0";

  version = "0.47.1";



  src = fetchFromGitHub rec {

    owner = "JGRennison";

    repo = "OpenTTD-patches";

    rev = "jgrpp-${version}";

    sha256 = "sha256-/kqwMZGXUYWlCnjk6uShJ5UARtvBSZWPExVel5o4xA8=";

    hash = "sha256-AMd2KXy/ODByeV9CkEd51KbE/+fZ8Us3WzsWCnn7nh0=";

  };



  buildInputs = oldAttrs.buildInputs ++ [ zstd ];

})