From f8d0786509dcd68ea674c0b37201e2e8a60f98e8 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 29 Dec 2024 23:37:11 +0900 Subject: cmd/fpkg: include nixGL source in inner store Signed-off-by: Ophestra --- cmd/fpkg/bundle.go | 2 ++ cmd/fpkg/install.go | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'cmd/fpkg') diff --git a/cmd/fpkg/bundle.go b/cmd/fpkg/bundle.go index aa1eecdb..572b295c 100644 --- a/cmd/fpkg/bundle.go +++ b/cmd/fpkg/bundle.go @@ -40,6 +40,8 @@ type bundleInfo struct { // allow gpu access within sandbox GPU bool `json:"gpu"` + // store path to nixGL source + NixGL string `json:"nix_gl,omitempty"` // store path to activate-and-exec script Launcher string `json:"launcher"` // store path to /run/current-system diff --git a/cmd/fpkg/install.go b/cmd/fpkg/install.go index 0b7ce7a6..36661647 100644 --- a/cmd/fpkg/install.go +++ b/cmd/fpkg/install.go @@ -98,7 +98,8 @@ func actionInstall(args []string) { if app != bundle { // do not try to re-install - if app.CurrentSystem == bundle.CurrentSystem && + if app.NixGL == bundle.NixGL && + app.CurrentSystem == bundle.CurrentSystem && app.Launcher == bundle.Launcher && app.ActivationPackage == bundle.ActivationPackage { cleanup() -- cgit v1.3.1