public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118257 from SFrijters/openttd-1.11.0

Browse Source
This commit is contained in:
Sandro 2021-04-02 18:16:38 +02:00 committed by GitHub
commit 491dbaf25a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchzip, pkg-config, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir { lib, stdenv, fetchurl, fetchzip, cmake, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir
, withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true
, withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps
, writeScriptBin, makeWrapper, runtimeShell , writeScriptBin, makeWrapper, runtimeShell
@ -6,18 +6,18 @@
let let
opengfx = fetchzip { opengfx = fetchzip {
url = "https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip"; url = "https://cdn.openttd.org/opengfx-releases/0.6.1/opengfx-0.6.1-all.zip";
sha256 = "1zg871j6kv7r0aqwca68d9kdf3smclgzan8hj76vj4fyfkykh173"; sha256 = "sha256-DeeIlLcmPeMZ0ju9DwXUInnQp2rWu60besDVto4+lDQ=";
}; };
opensfx = fetchzip { opensfx = fetchzip {
url = "https://cdn.openttd.org/opensfx-releases/0.2.3/opensfx-0.2.3-all.zip"; url = "https://cdn.openttd.org/opensfx-releases/1.0.1/opensfx-1.0.1-all.zip";
sha256 = "1bb167kszdd6dqbcdjrxxwab6b7y7jilhzi3qijdhprpm5gf1lp3"; sha256 = "sha256-U1PIKbMZHRJ0Z9Cp2RqqCMhD1xRyudoNHAYIZyotxVk=";
}; };
openmsx = fetchzip { openmsx = fetchzip {
url = "https://cdn.openttd.org/openmsx-releases/0.3.1/openmsx-0.3.1-all.zip"; url = "https://cdn.openttd.org/openmsx-releases/0.4.0/openmsx-0.4.0-all.zip";
sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4"; sha256 = "sha256-Ok6W+iqi4SP7cD4HUQERrAysvVibnN7Q4/tkugffDgQ=";
}; };
playmidi = writeScriptBin "playmidi" '' playmidi = writeScriptBin "playmidi" ''
@ -29,14 +29,14 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openttd"; pname = "openttd";
version = "1.10.3"; version = "1.11.0";
src = fetchurl { src = fetchurl {
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
sha256 = "0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1"; sha256 = "sha256-XmUYTgc2i6Gvpi27PjWrrubE2mcw/0vJ60RH1TNjx6g=";
}; };
nativeBuildInputs = [ pkg-config which makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ SDL2 libpng xz zlib freetype fontconfig libxdg_basedir ] buildInputs = [ SDL2 libpng xz zlib freetype fontconfig libxdg_basedir ]
++ lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; ++ lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ];
@ -46,25 +46,21 @@ stdenv.mkDerivation rec {
"--without-liblzo2" "--without-liblzo2"
]; ];
makeFlags = [ "INSTALL_PERSONAL_DIR=" ];
postInstall = '' postInstall = ''
mv $out/games/ $out/bin
${lib.optionalString withOpenGFX '' ${lib.optionalString withOpenGFX ''
cp ${opengfx}/* $out/share/games/openttd/baseset cp ${opengfx}/*.tar $out/share/games/openttd/baseset
''} ''}
mkdir -p $out/share/games/openttd/data mkdir -p $out/share/games/openttd/data
${lib.optionalString withOpenSFX '' ${lib.optionalString withOpenSFX ''
cp ${opensfx}/*.{obs,cat} $out/share/games/openttd/data cp ${opensfx}/*.tar $out/share/games/openttd/data
''} ''}
mkdir $out/share/games/openttd/baseset/openmsx mkdir $out/share/games/openttd/baseset/openmsx
${lib.optionalString withOpenMSX '' ${lib.optionalString withOpenMSX ''
cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/baseset/openmsx cp ${openmsx}/*.tar $out/share/games/openttd/baseset/openmsx
''} ''}
${lib.optionalString withFluidSynth '' ${lib.optionalString withFluidSynth ''

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

@ -2,12 +2,12 @@
openttd.overrideAttrs (oldAttrs: rec { openttd.overrideAttrs (oldAttrs: rec {
pname = "openttd-jgrpp"; pname = "openttd-jgrpp";
version = "0.34.4"; version = "0.40.5";
src = fetchFromGitHub rec { src = fetchFromGitHub rec {
owner = "JGRennison"; owner = "JGRennison";
repo = "OpenTTD-patches"; repo = "OpenTTD-patches";
rev = "jgrpp-${version}"; rev = "jgrpp-${version}";
sha256 = "125mgia5hgcsn8314xyiip3z8y23rc3kdv7jczbncqlzsc75624v"; sha256 = "sha256-g1RmgVjefOrOVLTvFBiPEd19aLoFvB9yX/hMiKgGcGw=";
}; };
}) })