lol

macopix: 1.7.4 -> 3.4.0, move to by-name/ (#388566)

authored by

h7x4 and committed by
GitHub
72e95465 ea931b82

+13 -9
+13 -5
pkgs/games/macopix/default.nix pkgs/by-name/ma/macopix/package.nix
··· 3 3 stdenv, 4 4 fetchurl, 5 5 pkg-config, 6 - gtk, 6 + gtk3, 7 7 openssl, 8 + versionCheckHook, 8 9 }: 9 10 10 11 stdenv.mkDerivation rec { 11 12 pname = "macopix"; 12 - version = "1.7.4"; 13 + version = "3.4.0"; 13 14 15 + # GitHub does not contain tags 16 + # https://github.com/chimari/MaCoPiX/issues/6 14 17 src = fetchurl { 15 - url = "http://rosegray.sakura.ne.jp/macopix/macopix-${version}.tar.bz2"; 16 - sha256 = "0sgnr0wrw3hglcnsyvipll7icfv69ssmyw584zfhk1rgramlkzyb"; 18 + url = "http://rosegray.sakura.ne.jp/macopix/macopix-${version}.tar.gz"; 19 + hash = "sha256-1AjqdPPCc9UQWqLdWlA+Va+MmvKL8dAIfJURPifN7RI="; 17 20 }; 18 21 19 22 nativeBuildInputs = [ pkg-config ]; 20 23 buildInputs = [ 21 - gtk 24 + gtk3 22 25 openssl 23 26 ]; 24 27 ··· 35 38 env.NIX_CFLAGS_COMPILE = "-fcommon"; 36 39 37 40 NIX_LDFLAGS = "-lX11"; 41 + 42 + nativeInstallCheckInputs = [ 43 + versionCheckHook 44 + ]; 45 + doInstallCheck = true; 38 46 39 47 meta = { 40 48 description = "Mascot Constructive Pilot for X";
-4
pkgs/top-level/all-packages.nix
··· 16250 16250 liquidwar5 = callPackage ../games/liquidwar/5.nix { 16251 16251 }; 16252 16252 16253 - macopix = callPackage ../games/macopix { 16254 - gtk = gtk2; 16255 - }; 16256 - 16257 16253 maptool = callPackage ../games/maptool { 16258 16254 # MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging 16259 16255 # at launch in a class initialization deadlock. MapTool ships Temurin with