diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-18 00:02:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-18 00:02:17 +0000 |
| commit | 35eee590bed8670b5adb8462a7748ac9376296bf (patch) | |
| tree | 2b35ce2cbc75e7a2c59f5c6cae23336e0c3a9461 /pkgs/games | |
| parent | 14b83b5e055518177178d9f496cc95b764712d71 (diff) | |
| parent | a8840a945f9ea405928f67dcc52bfb3ff94c2b11 (diff) | |
| download | nixpkgs-35eee590bed8670b5adb8462a7748ac9376296bf.tar nixpkgs-35eee590bed8670b5adb8462a7748ac9376296bf.tar.gz nixpkgs-35eee590bed8670b5adb8462a7748ac9376296bf.tar.bz2 nixpkgs-35eee590bed8670b5adb8462a7748ac9376296bf.tar.lz nixpkgs-35eee590bed8670b5adb8462a7748ac9376296bf.tar.xz nixpkgs-35eee590bed8670b5adb8462a7748ac9376296bf.tar.zst nixpkgs-35eee590bed8670b5adb8462a7748ac9376296bf.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/hikounomizu/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/games/openttd/jgrpp.nix | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/games/hikounomizu/default.nix index f55b7751640..c59418ac1a4 100644 --- a/pkgs/games/hikounomizu/default.nix +++ b/pkgs/games/hikounomizu/default.nix @@ -13,20 +13,22 @@ , libogg , libvorbis , libGLU +, enet , synfigstudio , inkscape , imagemagick , pngquant , xz +, bc }: stdenv.mkDerivation rec { pname = "hikounomizu"; - version = "0.9.2"; + version = "1.0"; src = fetchurl { url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2"; - hash = "sha256-ZtvzQAiYG4IcdgKiBDIQFOJVnLbz1TsiIbdZr/0Y2U8="; + hash = "sha256-Hw/BA7jOW9KGdde1NLDh4SfQXxvZkNGx/sHXukgFZ5M="; }; nativeBuildInputs = [ @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { imagemagick pngquant xz + bc ]; buildInputs = [ @@ -51,10 +54,11 @@ stdenv.mkDerivation rec { libogg libvorbis libGLU + enet ]; postBuild = '' - make data -j$NIX_BUILD_CORES + make data HNM_PARALLEL=$NIX_BUILD_CORES ''; meta = with lib; { diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index da113ed1afc..b8b07169766 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.54.4"; + version = "0.55.3"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-bTpHlKffQbANXIrAn9WSEK/PEzBW1nzaHhGKIyclAo0="; + hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; |