Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/services/games/asf.nix
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ in

rm -f www
${optionalString cfg.web-ui.enable ''
ln -s ${cfg.web-ui.package}/lib/dist www
ln -s ${cfg.web-ui.package}/ www
''}
'';
};
Expand Down
27 changes: 10 additions & 17 deletions pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{ lib, pkgs, fetchFromGitHub, nodejs, nodePackages, stdenv, ArchiSteamFarm }:
{ lib, fetchFromGitHub, buildNpmPackage, nodePackages, ArchiSteamFarm }:

let
nodePackages = import ./node-composition.nix {
inherit pkgs nodejs;
inherit (stdenv.hostPlatform) system;
};
buildNpmPackage {
pname = "asf-ui";
inherit (ArchiSteamFarm) version;

src = fetchFromGitHub {
owner = "JustArchiNET";
Expand All @@ -15,20 +13,15 @@ let
sha256 = "1ajmi2l6xhv3nlnag2kmkblny925irp4gngdc3mniiimw364p826";
};

in
nodePackages.package.override {
inherit src;
npmDepsHash = "sha256-AY1DFuZkB8tOQd2FzHuNZ31rtLlWujP+3AqsMMB2BhU=";

# upstream isn't tagged, but we are using the latest official commit for that specific asf version (assuming both get updated at the same time)
version = ArchiSteamFarm.version;
installPhase = ''
runHook preInstall

nativeBuildInputs = [ pkgs.nodePackages.node-gyp-build ];
mkdir $out
cp -rv dist/* $out/

postInstall = ''
patchShebangs node_modules/
npm run build
cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist
rm -rf $out/lib/node_modules/
runHook postInstall
'';

meta = with lib; {
Expand Down
17 changes: 0 additions & 17 deletions pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix

This file was deleted.

Loading