From 2f46896cb8fd4521e45025d30d1af91951eb86fb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 28 Nov 2024 19:05:28 +0100 Subject: [PATCH] xonotic: set pname and version --- pkgs/games/xonotic/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index c3356cc254e4..3977f87f8e93 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -158,18 +158,16 @@ in rec { rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") ''; meta.hydraPlatforms = []; - passthru.version = version; + inherit version pname; }; xonotic = runCommand "xonotic${variant}-${version}" { - inherit xonotic-unwrapped; + inherit xonotic-unwrapped version; + pname = "${pname}${variant}"; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; desktopItems = [ desktopItem ]; - passthru = { - inherit version; - meta = meta // { - hydraPlatforms = []; - }; + meta = meta // { + hydraPlatforms = []; }; } ('' mkdir -p $out/bin