Skip to content

Commit 553f779

Browse files
authored
scarab: fix crash (#345038), don't bundle tests (#346074)
2 parents e0df23e + 2edfaf4 commit 553f779

File tree

1 file changed

+30
-24
lines changed

1 file changed

+30
-24
lines changed

pkgs/tools/games/scarab/default.nix

+30-24
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
{ lib
2-
, buildDotnetModule
3-
, fetchFromGitHub
4-
, glibc
5-
, zlib
6-
, gtk3
7-
, copyDesktopItems
8-
, icoutils
9-
, wrapGAppsHook3
10-
, makeDesktopItem
1+
{
2+
lib,
3+
buildDotnetModule,
4+
fetchFromGitHub,
5+
glibc,
6+
zlib,
7+
gtk3,
8+
copyDesktopItems,
9+
icoutils,
10+
wrapGAppsHook3,
11+
makeDesktopItem,
1112
}:
1213

1314
buildDotnetModule rec {
@@ -22,7 +23,8 @@ buildDotnetModule rec {
2223
};
2324

2425
nugetDeps = ./deps.nix;
25-
projectFile = "Scarab.sln";
26+
projectFile = "Scarab/Scarab.csproj";
27+
testProjectFile = "Scarab.Tests/Scarab.Tests.csproj";
2628
executables = [ "Scarab" ];
2729

2830
preConfigureNuGet = ''
@@ -47,6 +49,8 @@ buildDotnetModule rec {
4749
wrapGAppsHook3
4850
];
4951

52+
doCheck = true;
53+
5054
postFixup = ''
5155
# Icons for the desktop file
5256
icotool -x $src/Scarab/Assets/omegamaggotprime.ico
@@ -58,26 +62,28 @@ buildDotnetModule rec {
5862
done
5963
'';
6064

61-
desktopItems = [(makeDesktopItem {
62-
desktopName = "Scarab";
63-
name = "scarab";
64-
exec = "Scarab";
65-
icon = "scarab";
66-
comment = meta.description;
67-
type = "Application";
68-
categories = [ "Game" ];
69-
})];
65+
desktopItems = [
66+
(makeDesktopItem {
67+
desktopName = "Scarab";
68+
name = "scarab";
69+
exec = "Scarab";
70+
icon = "scarab";
71+
comment = meta.description;
72+
type = "Application";
73+
categories = [ "Game" ];
74+
})
75+
];
7076

7177
passthru.updateScript = ./update.sh;
7278

73-
meta = with lib; {
79+
meta = {
7480
description = "Hollow Knight mod installer and manager";
7581
homepage = "https://github.com/fifty-six/Scarab";
7682
downloadPage = "https://github.com/fifty-six/Scarab/releases";
7783
changelog = "https://github.com/fifty-six/Scarab/releases/tag/v${version}";
78-
license = licenses.gpl3Only;
79-
maintainers = with maintainers; [ huantian ];
84+
license = lib.licenses.gpl3Only;
85+
maintainers = with lib.maintainers; [ huantian ];
8086
mainProgram = "Scarab";
81-
platforms = platforms.linux;
87+
platforms = lib.platforms.linux;
8288
};
8389
}

0 commit comments

Comments
 (0)