nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-19 22:30:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

gomuks-desktop: fix build for gomuks 26.08

Browse Source
This commit is contained in:
Logan Devine
2026-09-18 16:40:41 -07:00
parent 50c487f82c
commit 131643618f
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/by-name/go/gomuks-desktop/gomuks-binary-path.patch
View File

@@ -1,12 +0,0 @@
diff --git a/forge.config.ts b/forge.config.ts
index 198cdcc0..9997b4c8 100644
--- a/forge.config.ts
+++ b/forge.config.ts
@@ -87,6 +87,7 @@ const config: ForgeConfig = {
}
},
packageAfterCopy: async (_forgeConfig, buildPath, _electronVersion, platform, _arch) => {
+ return;
const binaryName = platform === "win32" ? "gomuks.exe" : "gomuks"
const resourcesDir = path.resolve(buildPath, "..")
const dest = path.join(resourcesDir, binaryName)

6
pkgs/by-name/go/gomuks-desktop/package.nix
View File

@@ -25,11 +25,11 @@ buildNpmPackage (finalAttrs: {
npmBuildScript = "package";
npmDepsFetcherVersion = 2;
npmDepsHash = "sha256-m3T9aPBuknyDIySa2fJagj0xeQmcJ/RgkzlDCsvfTKs=";
npmDepsHash = "sha256-nyf59B0QV5MjMCUwc12lZduZt6y761QKolmgM9mR4qQ=";
patches = [
./gomuks-binary-path.patch # fix location of gomuks-web binary at build-time
./resources-path.patch # allow specifying location of icons
# allow specifying location of icons and gomuks-web binary at runtime
./resources-path.patch
];
nativeBuildInputs = [

16
pkgs/by-name/go/gomuks-desktop/resources-path.patch
View File

@@ -1,5 +1,5 @@
diff --git a/forge.config.ts b/forge.config.ts
index 4fda2d92..16581c55 100644
index 2d3be537..d7271ed0 100644
--- a/forge.config.ts
+++ b/forge.config.ts
@@ -61,7 +61,7 @@ const config: ForgeConfig = {
@@ -11,11 +11,19 @@ index 4fda2d92..16581c55 100644
},
hooks: {
readPackageJson: async (_forgeConfig, packageJSON) => {
@@ -87,6 +87,7 @@ const config: ForgeConfig = {
}
},
packageAfterCopy: async (_forgeConfig, buildPath, _electronVersion, platform) => {
+ return;
const binaryName = platform === "win32" ? "gomuks.exe" : "gomuks"
const resourcesDir = path.resolve(buildPath, "..")
const dest = path.join(resourcesDir, binaryName)
diff --git a/src/mainwindow.ts b/src/mainwindow.ts
index da649371..94b52173 100644
index 0fba60fc..d297f665 100644
--- a/src/mainwindow.ts
+++ b/src/mainwindow.ts
@@ -56,7 +56,7 @@ export class GomuksWindow {
@@ -129,7 +129,7 @@ export class GomuksWindow {
createTray() {
const trayIconPath = path.join(
@@ -24,7 +32,7 @@ index da649371..94b52173 100644
process.platform === "darwin" ? "trayTemplate@2x.png" : "tray@2x.png",
)
this.tray = new Tray(nativeImage.createFromPath(trayIconPath))
@@ -136,6 +136,7 @@ export class GomuksWindow {
@@ -207,6 +207,7 @@ export class GomuksWindow {
width: 1280,
height: 720,
autoHideMenuBar: true,