diff --git a/pkgs/games/macopix/default.nix b/pkgs/by-name/ma/macopix/package.nix similarity index 88% rename from pkgs/games/macopix/default.nix rename to pkgs/by-name/ma/macopix/package.nix index 06ba50a18583..9893cd314807 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/by-name/ma/macopix/package.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfc6196f1ad6..a7a2449f936a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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