diff options
Diffstat (limited to 'nixpkgs/pkgs/games')
-rw-r--r-- | nixpkgs/pkgs/games/ferium/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/hyperrogue/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/itch/butler.nix | 44 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/itch/default.nix | 94 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/openmw/tes3mp.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/unnethack/default.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/vintagestory/default.nix | 4 |
8 files changed, 15 insertions, 149 deletions
diff --git a/nixpkgs/pkgs/games/ferium/default.nix b/nixpkgs/pkgs/games/ferium/default.nix index 8c923d0b7bec..903dd70222f6 100644 --- a/nixpkgs/pkgs/games/ferium/default.nix +++ b/nixpkgs/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.5.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1avmzaIDz4/ARewB7yLYMBVtwdkY4FFfwcHAZSyg1Xc="; + sha256 = "sha256-tYRs6HfFTdUZqWal9pLZ0uUNCPr3+zQz5JV2ohOLIP8="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-IOnTJ/0mul7buBDNHkeqMM9NrFiX58xa03bVGrbAdNg="; + cargoHash = "sha256-5ClBS42hWw3ULEG1Qn+fiM6dvJ+xS4Dusy3BCj5Cvbg="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/nixpkgs/pkgs/games/hyperrogue/default.nix b/nixpkgs/pkgs/games/hyperrogue/default.nix index 48febdc8ac04..ddbe41df430e 100644 --- a/nixpkgs/pkgs/games/hyperrogue/default.nix +++ b/nixpkgs/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "13.0b"; + version = "13.0c"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-n3CD1p0weWW9P3WnS05bauFbtShocleSACk4VOXzEeY="; + sha256 = "sha256-eELR/1GzR9wWJ433rIpueMu9omlsl1y5rmvG3GgSHZA="; }; CXXFLAGS = [ diff --git a/nixpkgs/pkgs/games/itch/butler.nix b/nixpkgs/pkgs/games/itch/butler.nix deleted file mode 100644 index cbd6b8aef936..000000000000 --- a/nixpkgs/pkgs/games/itch/butler.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, stdenv -, Cocoa -, fetchpatch -}: - -buildGoModule rec { - pname = "butler"; - version = "15.21.0"; - - src = fetchFromGitHub { - owner = "itchio"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-vciSmXR3wI3KcnC+Uz36AgI/WUfztA05MJv1InuOjJM="; - }; - - buildInputs = lib.optionals stdenv.isDarwin [ - Cocoa - ]; - - patches = [ - # update x/sys dependency for darwin build https://github.com/itchio/butler/pull/245 - (fetchpatch { - url = "https://github.com/itchio/butler/pull/245/commits/ef651d373e3061fda9692dd44ae0f7ce215e9655.patch"; - hash = "sha256-rZZn/OGiv3mRyy89uORyJ99zWN21kZCCQAlFvSKxlPU="; - }) - ]; - - proxyVendor = true; - - vendorHash = "sha256-CtBwc5mcgLvl2Bvg5gI+ULJMQEEibx1aN3IpmRNUtwE="; - - doCheck = false; - - meta = with lib; { - description = "Command-line itch.io helper"; - homepage = "https://github.com/itchio/butler"; - license = licenses.mit; - maintainers = with maintainers; [ martfont ]; - }; -} diff --git a/nixpkgs/pkgs/games/itch/default.nix b/nixpkgs/pkgs/games/itch/default.nix deleted file mode 100644 index 897d8f3941c4..000000000000 --- a/nixpkgs/pkgs/games/itch/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, stdenvNoCC -, fetchzip -, fetchFromGitHub -, butler -, electron -, steam-run -, makeWrapper -, copyDesktopItems -, makeDesktopItem -}: -stdenvNoCC.mkDerivation rec { - pname = "itch"; - version = "26.1.2"; - - # TODO: Using kitch instead of itch, revert when possible - src = fetchzip { - url = "https://broth.itch.ovh/k${pname}/linux-amd64/${version}/archive/default#.zip"; - stripRoot = false; - sha256 = "sha256-thXe+glpltSiKNGIRgvOZQZPJWfDHWo3dLdziyp2BM4="; - }; - - itch-setup = fetchzip { - url = "https://broth.itch.ovh/itch-setup/linux-amd64/1.26.0/itch-setup.zip"; - stripRoot = false; - sha256 = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; - }; - - icons = let sparseCheckout = "/release/images/itch-icons"; in - fetchFromGitHub { - owner = "itchio"; - repo = pname; - rev = "v${version}-canary"; - sha256 = "sha256-veZiKs9qHge+gCEpJ119bAT56ssXJAH3HBcYkEHqBFg="; - sparseCheckout = [ sparseCheckout ]; - } + sparseCheckout; - - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "itch %U"; - tryExec = pname; - icon = pname; - desktopName = pname; - mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; - comment = "Install and play itch.io games easily"; - categories = [ "Game" ]; - }) - ]; - - # As taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=itch-bin - installPhase = '' - runHook preInstall - - # TODO: Remove when the next stable Itch is stabilized - substituteInPlace ./resources/app/package.json \ - --replace "kitch" "itch" - - mkdir -p $out/bin $out/share/${pname}/resources/app - cp -r resources/app "$out/share/${pname}/resources/" - - install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" - install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" - - for icon in $icons/icon*.png - do - iconsize="''${icon#$icons/icon}" - iconsize="''${iconsize%.png}" - icondir="$out/share/icons/hicolor/''${iconsize}x''${iconsize}/apps/" - install -Dm644 "$icon" "$icondir/itch.png" - done - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${steam-run}/bin/steam-run $out/bin/${pname} \ - --add-flags ${electron}/bin/electron \ - --add-flags $out/share/${pname}/resources/app \ - --set BROTH_USE_LOCAL butler,itch-setup \ - --prefix PATH : ${butler}/bin/:${itch-setup} - ''; - - meta = with lib; { - description = "The best way to play itch.io games"; - homepage = "https://github.com/itchio/itch"; - license = licenses.mit; - platforms = platforms.linux; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; - maintainers = with maintainers; [ pasqui23 ]; - }; -} diff --git a/nixpkgs/pkgs/games/openmw/tes3mp.nix b/nixpkgs/pkgs/games/openmw/tes3mp.nix index 915c006f9137..318c28aff922 100644 --- a/nixpkgs/pkgs/games/openmw/tes3mp.nix +++ b/nixpkgs/pkgs/games/openmw/tes3mp.nix @@ -7,14 +7,13 @@ , luajit , makeWrapper , symlinkJoin -, disable-warnings-if-gcc13 }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy let # raknet could also be split into dev and lib outputs - raknet = disable-warnings-if-gcc13 (stdenv.mkDerivation { + raknet = stdenv.mkDerivation { pname = "raknet"; version = "unstable-2020-01-19"; @@ -46,7 +45,7 @@ let installPhase = '' install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a ''; - }); + }; coreScripts = stdenv.mkDerivation { pname = "corescripts"; diff --git a/nixpkgs/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix b/nixpkgs/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix index 488110684c09..5e7ed1b817e0 100644 --- a/nixpkgs/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix +++ b/nixpkgs/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix @@ -18,7 +18,7 @@ callPackage ./generic.nix rec { patches = [(substitute { src = ./disable-git-version.patch; - replacements = [ "--subst-var-by" "version" version ]; + substitutions = [ "--subst-var-by" "version" version ]; })]; depsHash = "sha256-0P/BcjNnbDN25DguRcCyzPuUG7bouxEx1ySodIbSwvg="; diff --git a/nixpkgs/pkgs/games/unnethack/default.nix b/nixpkgs/pkgs/games/unnethack/default.nix index af402a7de935..f328b8c01eed 100644 --- a/nixpkgs/pkgs/games/unnethack/default.nix +++ b/nixpkgs/pkgs/games/unnethack/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { }) ]; + # Fails at startup due to off-by-one: + # https://github.com/NixOS/nixpkgs/issues/292113#issuecomment-1969989058 + # TODO: drop it once 6.x branch releases. + hardeningDisable = [ "fortify3" ]; + # Fails the build occasionally due to missing buid depends: # ./../sys/unix/unixmain.c:9:10: fatal error: date.h: No such file or directory # TODO: remove once upstream issue is fixed: diff --git a/nixpkgs/pkgs/games/vintagestory/default.nix b/nixpkgs/pkgs/games/vintagestory/default.nix index 474b5e2ddbac..182f0621bfed 100644 --- a/nixpkgs/pkgs/games/vintagestory/default.nix +++ b/nixpkgs/pkgs/games/vintagestory/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.19.3"; + version = "1.19.4"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-ULxwNdQLQCWJqCTiGtT1X/Y32f406FT/UPAJNBYrV/s="; + hash = "sha256-A5NIWy902a0W/Y/sJL+qPrEJwCiU/TNIm7G3BtU6gzM="; }; |