From 8423bbf30f6fdbd18f02afeddd2e7acb4a347058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= <msyds@deertopia.net>
Date: Thu, 30 Oct 2025 14:44:23 -0600
Subject: [PATCH] Revert "Revert "Fix mkTf2Config derivation names ending with
 a dash -""

This reverts commit 98673e8d34fbe59e3c5e9f27068a46e6b61ccc60.
---
 tf2/mkTf2Config.nix                        | 3 ++-
 tf2/packages/huds/extras.nix               | 2 +-
 tf2/packages/huds/hud-db/default.nix       | 2 +-
 tf2/packages/maps/jump-academy/default.nix | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tf2/mkTf2Config.nix b/tf2/mkTf2Config.nix
index 72b79d6..54efdde 100644
--- a/tf2/mkTf2Config.nix
+++ b/tf2/mkTf2Config.nix
@@ -1,7 +1,7 @@
 { stdenv, lib }:
 
 { pname
-, version ? ""
+, version ? null
 , custom ? []
 , cfg ? []
 , maps ? []
@@ -47,6 +47,7 @@ let
     "env"
   ];
 in stdenv.mkDerivation ({
+  inherit name;
   inherit pname version;
   # Adapted from stdenv's _defaultUnpack().
   unpackCmd = ''
diff --git a/tf2/packages/huds/extras.nix b/tf2/packages/huds/extras.nix
index 2290f5d..b765111 100644
--- a/tf2/packages/huds/extras.nix
+++ b/tf2/packages/huds/extras.nix
@@ -5,7 +5,7 @@
     pname = "deerhud";
     custom = [
       (fetchFromGitHub {
-        name = "deerhud";
+        name = "deerhud-src";
         owner = "DeerUwU";
         repo = "deerhud-tf2";
         rev = "78a24effbc66bc78b4bb557228eaa0195db3270c";
diff --git a/tf2/packages/huds/hud-db/default.nix b/tf2/packages/huds/hud-db/default.nix
index b8714a6..e650514 100644
--- a/tf2/packages/huds/hud-db/default.nix
+++ b/tf2/packages/huds/hud-db/default.nix
@@ -5,7 +5,7 @@ builtins.mapAttrs
     pname = name;
     custom = [
       (fetchFromGitHub (builtins.removeAttrs e.src ["__type"] // {
-        inherit name;
+        name = "${name}-src";
       }))
     ];
     meta = {
diff --git a/tf2/packages/maps/jump-academy/default.nix b/tf2/packages/maps/jump-academy/default.nix
index 131c22b..40e8ef8 100644
--- a/tf2/packages/maps/jump-academy/default.nix
+++ b/tf2/packages/maps/jump-academy/default.nix
@@ -6,6 +6,7 @@ builtins.mapAttrs
     env.description = e.description;
     maps = [
       (fetchurl {
+        name = "${name}-src";
         inherit (e.src) url hash;
       })
     ];