Unverified Commit 5b298518 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

xpilot-ng, bloodspilot-{client,server}: move to by-name, modernize (#450247)

parents a29357db 9924426f
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@
  SDL_image,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  version = "1.5.0";
  pname = "bloodspilot-client";

  src = fetchurl {
    url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz";
    sha256 = "1qwl95av5an2zl01m7saj6fyy49xpixga7gbn4lwbpgpqs1rbwxj";
    url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${finalAttrs.version}/bloodspilot-client-sdl-${finalAttrs.version}.tar.gz";
    hash = "sha256-svOVg8b33cUpsesd9Xq8PRHvnZFKnxoA/cKqslVJlOM=";
  };

  patches = [ ./bloodspilot-sdl-window-fix.patch ];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
    mainProgram = "bloodspilot-client-sdl";
    homepage = "http://bloodspilot.sf.net/";
    license = lib.licenses.gpl2Plus;
    maintainers = [ lib.maintainers.raskin ];
    maintainers = with lib.maintainers; [ raskin ];
    platforms = lib.platforms.linux;
  };
}
})
+8 −8
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@
  expat,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "bloodspilot-xpilot-fxi-server";
  version = "1.4.6";

  src = fetchurl {
    url = "mirror://sourceforge/project/bloodspilot/server/server%20v${version}/xpilot-${version}fxi.tar.gz";
    sha256 = "0d7hnpshifq6gy9a0g6il6h1hgqqjyys36n8w84hr8d4nhg4d1ji";
    url = "mirror://sourceforge/project/bloodspilot/server/server%20v${finalAttrs.version}/xpilot-${finalAttrs.version}fxi.tar.gz";
    hash = "sha256-UYZGHrSkoQwJ4siaob2XGD8YoKHRPKCSfwa7CPW18DQ=";
  };

  buildInputs = [
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
    ./bloodspilot-server-strcpy-fix.patch
  ];

  meta = with lib; {
  meta = {
    description = "Multiplayer X11 space combat game (server part)";
    mainProgram = "xpilots";
    homepage = "http://bloodspilot.sf.net/";
    license = licenses.gpl2Plus;
    maintainers = [ maintainers.raskin ];
    platforms = platforms.linux;
    license = lib.licenses.gpl2Plus;
    maintainers = with lib.maintainers; [ raskin ];
    platforms = lib.platforms.linux;
  };
}
})
Loading