From 67aacbb937fc35710cf7101d42d1f1aa5fcbed72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 15 Nov 2022 23:23:15 +0100 Subject: [PATCH 1/2] dwarf-therapist: restrict platforms to x86 Avoid trying to build for aarch64 on Hydra. Dwarf Fortress only runs on x86. --- pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index ec765e71158e..42dd74a766b2 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Tool to manage dwarves in a running game of Dwarf Fortress"; maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.x86; homepage = "https://github.com/Dwarf-Therapist/Dwarf-Therapist"; }; } From 22b96bfb353a5198845782325ed5269c8e4b7278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 16 Nov 2022 12:21:34 +0100 Subject: [PATCH 2/2] dwarf-therapist: pass through `meta` --- pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 316d1308eb79..dad59953533b 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { pname = "dwarf-therapist"; - version = dwarf-therapist.version; + inherit (dwarf-therapist) version meta; wrapper = substituteAll { src = ./dwarf-therapist.in;