macopix: move to by-name/

This commit is contained in:
Petr Zahradnik 2025-03-10 00:34:14 +01:00
parent 8f2290ef1c
commit 553197db50
2 changed files with 9 additions and 7 deletions

View File

@ -3,13 +3,14 @@
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
@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gtk
gtk3
openssl
];
@ -38,6 +39,11 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lX11";
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = {
description = "Mascot Constructive Pilot for X";
mainProgram = "macopix";

View File

@ -16265,10 +16265,6 @@ with pkgs;
liquidwar5 = callPackage ../games/liquidwar/5.nix {
};
macopix = callPackage ../games/macopix {
gtk = gtk3;
};
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