Unverified Commit 4cb6465c authored by Michele Guerini Rocco's avatar Michele Guerini Rocco Committed by GitHub
Browse files

veloren: 0.17.0 -> 0.18.0 (#484170)

parents 60caf3d5 8a67bf12

pkgs/by-name/ve/veloren/fix-on-rust-stable.patch

deleted100644 → 0
+0 −4275

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/ve/veloren/package.nix

+9 −8
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
let

  # Note: use this to get the release metadata

  # https://gitlab.com/api/v4/projects/10174980/repository/tags/v{version}

  version = "0.17.0";

  date = "2024-12-28-12:49";

  rev = "a1be5a7bece7af43ebd76910eb0020c1cf3c0798";

  version = "0.18.0";

  timestamp = "1769191511";

  rev = "1d12f35edd6cdbfc1fb921c167cdd7beeeffe248";

in



rustPlatform.buildRustPackage {
@@ -34,15 +34,14 @@ rustPlatform.buildRustPackage { 
    owner = "veloren";

    repo = "veloren";

    inherit rev;

    hash = "sha256-AnmXn4GWzxu27FUyQIIVnANtu3sr0NIi7seN7buAtL8=";

    hash = "sha256-tngIwFq18kvOU2XwCQoeLWjiVDjrJgOf3XIYz2J2cWs=";

  };



  cargoPatches = [

    ./fix-on-rust-stable.patch

    ./fix-assets-path.patch

  ];



  cargoHash = "sha256-hxDVFJxZQ2Seg4vapSE8PsT527GOs9DFWFnacKwWkiM=";

  cargoHash = "sha256-1qLE1UeP2i0xaOGLniZzdjIkBbme6rctGfcO9Kfoh5E=";



  postPatch = ''

    # Force vek to build in unstable mode
@@ -54,6 +53,8 @@ rustPlatform.buildRustPackage { 
    EOF

    # Fix assets path

    substituteAllInPlace common/assets/src/lib.rs

    # Do not use mold, it produces broken binaries

    substituteInPlace .cargo/config.toml --replace-fail mold gold

  '';



  nativeBuildInputs = [
@@ -78,8 +79,7 @@ rustPlatform.buildRustPackage { 
    RUSTC_BOOTSTRAP = true;



    # Set version info, required by veloren-common

    NIX_GIT_TAG = "v${version}";

    NIX_GIT_HASH = "${lib.substring 0 8 rev}/${date}";

    VELOREN_GIT_VERSION = "/${lib.substring 0 8 rev}/${timestamp}";



    # Save game data under user's home directory,

    # otherwise it defaults to $out/bin/../userdata
@@ -99,6 +99,7 @@ rustPlatform.buildRustPackage { 
        libxi

        libxcursor

        libxrandr

        libxkbcommon

        vulkan-loader

      ]

      ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform wayland) [