macopix: 1.7.4 -> 3.4.0, move to by-name/ (#388566) (72e95465) · Commits · nix / nixpkgs

pkgs/games/macopix/default.nix→pkgs/by-name/ma/macopix/package.nix

+13 −5

Original line number	Diff line number	Diff line
		@@ -3,22 +3,25 @@
		stdenv,
		fetchurl,
		pkg-config,
		gtk,
		gtk3,
		openssl,
		versionCheckHook,
		}:

		stdenv.mkDerivation rec {
		pname = "macopix";
		version = "1.7.4";
		version = "3.4.0";

		# GitHub does not contain tags
		# https://github.com/chimari/MaCoPiX/issues/6
		src = fetchurl {
		url = "http://rosegray.sakura.ne.jp/macopix/macopix-${version}.tar.bz2";
		sha256 = "0sgnr0wrw3hglcnsyvipll7icfv69ssmyw584zfhk1rgramlkzyb";
		url = "http://rosegray.sakura.ne.jp/macopix/macopix-${version}.tar.gz";
		hash = "sha256-1AjqdPPCc9UQWqLdWlA+Va+MmvKL8dAIfJURPifN7RI=";
		};

		nativeBuildInputs = [ pkg-config ];
		buildInputs = [
		gtk
		gtk3
		openssl
		];

		@@ -36,6 +39,11 @@ stdenv.mkDerivation rec {

		NIX_LDFLAGS = "-lX11";

		nativeInstallCheckInputs = [
		versionCheckHook
		];
		doInstallCheck = true;

		meta = {
		description = "Mascot Constructive Pilot for X";
		mainProgram = "macopix";

+0 −4

Original line number	Diff line number	Diff line
		@@ -16250,10 +16250,6 @@ with pkgs;
		liquidwar5 = callPackage ../games/liquidwar/5.nix {
		};

		macopix = callPackage ../games/macopix {
		gtk = gtk2;
		};

		maptool = callPackage ../games/maptool {
		# MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging
		# at launch in a class initialization deadlock. MapTool ships Temurin with