dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #167029 from SFrijters/openttd-12.2

Browse Source
This commit is contained in:
Martin Weinelt 2022-04-03 16:21:19 +02:00 committed by GitHub
commit 4dae95a040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/openttd/default.nix
View File

@ -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 ];

8
pkgs/games/openttd/jgrpp.nix
View File

@ -1,13 +1,15 @@
{ 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 ];
})