macopix: move to by-name/

+9 -7
+9 -3
pkgs/games/macopix/default.nix pkgs/by-name/ma/macopix/package.nix
··· 3 stdenv, 4 fetchurl, 5 pkg-config, 6 - gtk, 7 openssl, 8 }: 9 10 stdenv.mkDerivation rec { 11 pname = "macopix"; 12 - version = "1.7.4"; 13 14 # GitHub does not contain tags 15 # https://github.com/chimari/MaCoPiX/issues/6 ··· 20 21 nativeBuildInputs = [ pkg-config ]; 22 buildInputs = [ 23 - gtk 24 openssl 25 ]; 26 ··· 37 env.NIX_CFLAGS_COMPILE = "-fcommon"; 38 39 NIX_LDFLAGS = "-lX11"; 40 41 meta = { 42 description = "Mascot Constructive Pilot for X";
··· 3 stdenv, 4 fetchurl, 5 pkg-config, 6 + gtk3, 7 openssl, 8 + versionCheckHook, 9 }: 10 11 stdenv.mkDerivation rec { 12 pname = "macopix"; 13 + version = "3.4.0"; 14 15 # GitHub does not contain tags 16 # https://github.com/chimari/MaCoPiX/issues/6 ··· 21 22 nativeBuildInputs = [ pkg-config ]; 23 buildInputs = [ 24 + gtk3 25 openssl 26 ]; 27 ··· 38 env.NIX_CFLAGS_COMPILE = "-fcommon"; 39 40 NIX_LDFLAGS = "-lX11"; 41 + 42 + nativeInstallCheckInputs = [ 43 + versionCheckHook 44 + ]; 45 + doInstallCheck = true; 46 47 meta = { 48 description = "Mascot Constructive Pilot for X";
-4
pkgs/top-level/all-packages.nix
··· 16265 liquidwar5 = callPackage ../games/liquidwar/5.nix { 16266 }; 16267 16268 - macopix = callPackage ../games/macopix { 16269 - gtk = gtk3; 16270 - }; 16271 - 16272 maptool = callPackage ../games/maptool { 16273 # MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging 16274 # at launch in a class initialization deadlock. MapTool ships Temurin with
··· 16265 liquidwar5 = callPackage ../games/liquidwar/5.nix { 16266 }; 16267 16268 maptool = callPackage ../games/maptool { 16269 # MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging 16270 # at launch in a class initialization deadlock. MapTool ships Temurin with