From 4903f64bcddf766edf72fbc9f496e95a8e59f0ba Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 21 Apr 2024 14:31:08 +0200 Subject: [PATCH] gcs: 5.20.4 -> 5.21.0 --- pkgs/by-name/gc/gcs/package.nix | 36 +++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix index 2dc0864c3927..e8d9a337f04a 100644 --- a/pkgs/by-name/gc/gcs/package.nix +++ b/pkgs/by-name/gc/gcs/package.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, + buildNpmPackage, fetchFromGitHub, pkg-config, - moreutils, libGL, libX11, libXcursor, @@ -16,18 +16,17 @@ freetype, stdenv, darwin, - nix-update-script, }: buildGoModule rec { pname = "gcs"; - version = "5.20.4"; + version = "5.21.0"; src = fetchFromGitHub { owner = "richardwilkes"; repo = "gcs"; rev = "v${version}"; - hash = "sha256-aoU2wRz2XB6+3e6am/dLjRbcDmWTjtDtTBwc6c4n3DE="; + hash = "sha256-mes1aXh4R1re4sW3xYDWtSIcW7lwkWoAxbcbdyT/W+o="; }; modPostBuild = '' @@ -35,12 +34,29 @@ buildGoModule rec { sed -i 's|-lmupdf[^ ]* |-lmupdf |g' vendor/github.com/richardwilkes/pdf/pdf.go ''; - vendorHash = "sha256-ee6qvwnUXtsBcovPOORfVpdndICtIUYe4GrP52V/P3k="; + vendorHash = "sha256-H5GCrrqmDwpCneXawu7kZsRfrQ8hcsbqhpAAG6FCawg="; - nativeBuildInputs = [ - pkg-config - moreutils - ]; + frontend = buildNpmPackage { + name = "${pname}-${version}-frontend"; + + inherit src; + sourceRoot = "${src.name}/server/frontend"; + + npmDepsHash = "sha256-wP6sjdcjljzmTs0GUMbF2BPo83LKpfdn15sUuMEIn6E="; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r dist $out/dist + runHook postInstall + ''; + }; + + postPatch = '' + cp -r ${frontend}/dist server/frontend/dist + ''; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -75,8 +91,6 @@ buildGoModule rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; - meta = { changelog = "https://github.com/richardwilkes/gcs/releases/tag/${src.rev}"; description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system";