msyds/tf2-nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix mkTf2Config derivation names ending with a dash -"

Browse Source 
This reverts commit 61c63737af.

Fixes JumpAcademy maps failing to build.
This commit is contained in:
Madeleine Sydney Slaga
2025-10-26 02:26:18 -06:00
parent c32ffd6101
commit 98673e8d34
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tf2/mkTf2Config.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, lib }: { stdenv, lib }:
{ pname { pname
, version ? null , version ? ""
, custom ? [] , custom ? []
, cfg ? [] , cfg ? []
, maps ? [] , maps ? []
@@ -47,7 +47,6 @@ let
"env" "env"
]; ];
in stdenv.mkDerivation ({ in stdenv.mkDerivation ({
inherit name;
inherit pname version; inherit pname version;
# Adapted from stdenv's _defaultUnpack(). # Adapted from stdenv's _defaultUnpack().
unpackCmd = '' unpackCmd = ''

2
tf2/packages/huds/extras.nix
View File

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

2
tf2/packages/huds/hud-db/default.nix
View File

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

1
tf2/packages/maps/jump-academy/default.nix
View File

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