Unverified Commit 9e538a05 authored by Rafael Ieda's avatar Rafael Ieda
Browse files

lincity-ng: move to by-name, modernize

parent 436d1c7b
Loading
Loading
Loading
Loading
+11 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
  libxml2,
  libxmlxx5,
  libxslt,
  physfs,
  physfs_2,
  pkg-config,
  xorgproto,
  zlib,
@@ -24,6 +24,11 @@
  include-what-you-use,
}:

let
  # https://github.com/lincity-ng/lincity-ng/issues/25
  physfs = physfs_2;
in

stdenv.mkDerivation (finalAttrs: {
  pname = "lincity-ng";
  version = "2.13.1";
@@ -31,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "lincity-ng";
    repo = "lincity-ng";
    rev = "lincity-ng-${finalAttrs.version}";
    tag = "lincity-ng-${finalAttrs.version}";
    hash = "sha256-ACJVhMq2IEJNrbAdmkgHxQV0uKSXpwR8a/5jcrQS+oI=";
  };

@@ -75,11 +80,11 @@ stdenv.mkDerivation (finalAttrs: {
    -I${lib.getDev SDL2_mixer}/include/SDL2
  ";

  meta = with lib; {
  meta = {
    description = "City building game";
    mainProgram = "lincity-ng";
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ raskin ];
    platforms = platforms.linux;
    license = lib.licenses.gpl2Plus;
    maintainers = with lib.maintainers; [ raskin ];
    platforms = lib.platforms.linux;
  };
})
+1 −0
Original line number Diff line number Diff line
@@ -1443,6 +1443,7 @@ mapAliases {
  Literate = literate; # Added 2024-06-12
  littlenavmap = throw "littlenavmap has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
  llama = walk; # Added 2023-01-23
  lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09

  # Linux kernels
  linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
+0 −5
Original line number Diff line number Diff line
@@ -13499,11 +13499,6 @@ with pkgs;

  legendary-gl = python3Packages.callPackage ../games/legendary-gl { };

  lincity_ng = callPackage ../games/lincity/ng.nix {
    # https://github.com/lincity-ng/lincity-ng/issues/25
    physfs = physfs_2;
  };

  liquidwar = callPackage ../games/liquidwar {
    guile = guile_2_0;
  };