Commit 80956ee6 authored by Rebecca Kelly's avatar Rebecca Kelly Committed by Rebecca Kelly
Browse files

crossfire-*: move to pkgs/by-name/

This covers the server, maps, arch, and client packages. It also gets rid of the
whole hashes-and-versions-in-a-separate-file thing which made sense when I first
wrote it but is kind of clunky now.
parent 4bf4ae1b
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -2,23 +2,25 @@
  stdenv,
  lib,
  fetchgit,
  version,
  rev,
  hash,
}:

stdenv.mkDerivation {
  pname = "crossfire-arch";
  version = rev;
  version = "2025-04";

  src = fetchgit {
    url = "https://git.code.sf.net/p/crossfire/crossfire-arch";
    inherit hash rev;
    rev = "876eb50b9199e9aa06175b7a7d85832662be3f78";
    hash = "sha256-jDiAKcjWYvjGiD68LuKlZS4sOR9jW3THp99kAEdE+y0=";
  };

  installPhase = ''
    runHook preInstall

    mkdir -p "$out"
    cp -a . "$out/"

    runHook postInstall
  '';

  meta = with lib; {
+3 −5
Original line number Diff line number Diff line
@@ -22,18 +22,16 @@
  SDL2_mixer,
  libselinux,
  libsepol,
  version,
  rev,
  hash,
}:

stdenv.mkDerivation {
  pname = "crossfire-client";
  version = rev;
  version = "2025-01";

  src = fetchgit {
    url = "https://git.code.sf.net/p/crossfire/crossfire-client";
    inherit hash rev;
    hash = "sha256-iFm9yVEIBwngr8/0f9TRS4Uw0hnjrW6ngMRfsWY6TX0=";
    rev = "c69f578add358c1db567f6b46f532dd038d2ade0";
  };

  nativeBuildInputs = [
+7 −5
Original line number Diff line number Diff line
@@ -2,23 +2,25 @@
  stdenv,
  lib,
  fetchgit,
  version,
  rev,
  hash,
}:

stdenv.mkDerivation {
  pname = "crossfire-maps";
  version = rev;
  version = "2025-04";

  src = fetchgit {
    url = "https://git.code.sf.net/p/crossfire/crossfire-maps";
    inherit hash rev;
    rev = "ec57d473064ed1732adb1897415b56f96fbd9382";
    hash = "sha256-hJOMa8c80T4/NC37NKM270LDHNqWK6NZfKvKnFno9TE=";
  };

  installPhase = ''
    runHook preInstall

    mkdir -p "$out"
    cp -a . "$out/"

    runHook postInstall
  '';

  meta = with lib; {
+7 −7
Original line number Diff line number Diff line
{
  stdenv,
  lib,
  pkgs,
  fetchgit,
  autoconf,
  automake,
@@ -10,20 +11,19 @@
  check,
  pkg-config,
  python3,
  version,
  rev,
  hash,
  maps,
  arch,
  # Included here so that hosts using custom maps/archetypes can easily override.
  maps ? pkgs.crossfire-maps,
  arch ? pkgs.crossfire-arch,
}:

stdenv.mkDerivation {
  pname = "crossfire-server";
  version = rev;
  version = "2025-04";

  src = fetchgit {
    url = "https://git.code.sf.net/p/crossfire/crossfire-server";
    inherit hash rev;
    rev = "5f742b9f9f785e4a59a3a463bee1f31c9bc67098";
    hash = "sha256-e7e3xN7B1cv9+WkZGzOJgrFer50Cs0L/2dYB9RmGCiE=";
  };

  nativeBuildInputs = [
+0 −13
Original line number Diff line number Diff line
diff --git a/include/Treasures.h b/include/Treasures.h
index 614078f..a00b4f6 100644
--- a/include/Treasures.h
+++ b/include/Treasures.h
@@ -13,6 +13,8 @@
 #ifndef TREASURES_H
 #define TREASURES_H
 
+#include <cstdint>
+
 #include "AssetsCollection.h"
 
 extern "C" {
Loading