movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

macopix: move to by-name/

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,13 +3,14 @@
stdenv, stdenv,
fetchurl, fetchurl,
pkg-config, pkg-config,
gtk, gtk3,
openssl, openssl,
versionCheckHook,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "macopix"; pname = "macopix";
version = "1.7.4"; version = "3.4.0";
# GitHub does not contain tags # GitHub does not contain tags
# https://github.com/chimari/MaCoPiX/issues/6 # https://github.com/chimari/MaCoPiX/issues/6
@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
gtk gtk3
openssl openssl
]; ];
@ -38,6 +39,11 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lX11"; NIX_LDFLAGS = "-lX11";
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = { meta = {
description = "Mascot Constructive Pilot for X"; description = "Mascot Constructive Pilot for X";
mainProgram = "macopix"; mainProgram = "macopix";

4
pkgs/top-level/all-packages.nix
View file

@ -16265,10 +16265,6 @@ with pkgs;
liquidwar5 = callPackage ../games/liquidwar/5.nix { liquidwar5 = callPackage ../games/liquidwar/5.nix {
}; };
macopix = callPackage ../games/macopix {
gtk = gtk3;
};
maptool = callPackage ../games/maptool { maptool = callPackage ../games/maptool {
# MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging # MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging
# at launch in a class initialization deadlock. MapTool ships Temurin with # at launch in a class initialization deadlock. MapTool ships Temurin with