lincity, lincity-ng: move to by-name, modernize, adopt (#450319) (a29357db) · Commits · nix / nixpkgs

pkgs/games/lincity/ng.nix→pkgs/by-name/li/lincity-ng/package.nix

+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;
		};
		})

pkgs/games/lincity/default.nix→pkgs/by-name/li/lincity/package.nix

+9 −9

Original line number	Diff line number	Diff line
		@@ -12,13 +12,13 @@
		zlib,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "lincity";
		version = "1.13.1";

		src = fetchurl {
		url = "mirror://sourceforge/lincity/${pname}-${version}.tar.gz";
		sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v";
		url = "mirror://sourceforge/lincity/lincity-${finalAttrs.version}.tar.gz";
		hash = "sha256-e0y9Ef/Uy+15oKrbJfKxw04lqCARgvuyWc4vRQ/lAV0=";
		};

		buildInputs = [
		@@ -34,11 +34,11 @@ stdenv.mkDerivation rec {
		patches = [
		(fetchpatch {
		url = "https://sources.debian.net/data/main/l/lincity/1.13.1-13/debian/patches/extern-inline-functions-777982";
		sha256 = "06dp3zwk0z5wr5a3xaaj2my75vcjcy98vc22hsag7ggd9jwrkcp0";
		hash = "sha256-4LKZuUztvfOUhkKwjZJnku1yfBVSqT5Uybx8MPkftxk=";
		})
		(fetchpatch {
		url = "https://sources.debian.net/data/main/l/lincity/1.13.1-13/debian/patches/clang-ftbfs-757859";
		sha256 = "098rnywcsyc0m11x4a5m3dza8i0jmfh6pacfgma1vvxpsfkb6ngp";
		hash = "sha256-91mzptO37x1UfY6pa6CrEkSkfhu1KNJDqIB5zbi3GSU=";
		})
		(fetchpatch {
		url = "https://sources.debian.org/data/main/l/lincity/1.13.1-16/debian/patches/fix-implicit-declarations-823432";
		@@ -68,13 +68,13 @@ stdenv.mkDerivation rec {
		sed -e 's@\[MPS_INFO_CHARS\]@[MPS_INFO_CHARS+8]@' -i mps.c -i mps.h
		'';

		meta = with lib; {
		meta = {
		description = "City simulation game";
		mainProgram = "xlincity";
		license = licenses.gpl2Plus;
		license = lib.licenses.gpl2Plus;
		homepage = "https://sourceforge.net/projects/lincity";
		maintainers = [ ];
		maintainers = with lib.maintainers; [ iedame ];
		# ../lcintl.h:14:10: fatal error: 'libintl.h' file not found
		broken = stdenv.hostPlatform.isDarwin;
		};
		}
		})

pkgs/top-level/aliases.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -1444,6 +1444,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;

pkgs/top-level/all-packages.nix

+0 −7

Original line number	Diff line number	Diff line
		@@ -13487,13 +13487,6 @@ with pkgs;

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

		lincity = callPackage ../games/lincity { };

		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;
		};

Admin message