Fix mkTf2Config derivation names ending with a dash -

Also changed some of the source derivation names to keep our sanity
This commit is contained in:
Shelvacu
2025-06-29 19:16:52 -07:00
committed by Shelvacu on fw
parent 1b2a146025
commit 61c63737af
4 changed files with 5 additions and 3 deletions

View File

@@ -1,7 +1,7 @@
{ stdenv, lib }:
{ pname
, version ? ""
, version ? null
, custom ? []
, cfg ? []
, maps ? []
@@ -35,6 +35,7 @@ let
then { src = builtins.head allSrcs; }
else { srcs = allSrcs; sourceRoot = "."; };
in stdenv.mkDerivation ({
inherit name;
inherit pname version;
# Adapted from stdenv's _defaultUnpack().
unpackCmd = ''

View File

@@ -5,7 +5,7 @@
pname = "deerhud";
custom = [
(fetchFromGitHub {
name = "deerhud";
name = "deerhud-src";
owner = "DeerUwU";
repo = "deerhud-tf2";
rev = "78a24effbc66bc78b4bb557228eaa0195db3270c";

View File

@@ -6,7 +6,7 @@ builtins.mapAttrs
env.description = e.description;
custom = [
(fetchFromGitHub (builtins.removeAttrs e.src ["__type"] // {
inherit name;
name = "${name}-src";
}))
];
})

View File

@@ -6,6 +6,7 @@ builtins.mapAttrs
env.description = e.description;
maps = [
(fetchurl {
name = "${name}-src";
inherit (e.src) url hash;
})
];