diff options
| author | Freya Murphy <freya@freyacat.org> | 2025-07-25 20:24:31 -0400 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2025-07-25 20:24:31 -0400 |
| commit | 32b518b8039857f26e110c903a9ae7a6b453d7dc (patch) | |
| tree | 7fc79461e63df3d2127254bbfd429f25788d0818 | |
| parent | refactor config out of modules/options.nix (diff) | |
| download | dotfiles-nix-32b518b8039857f26e110c903a9ae7a6b453d7dc.tar.gz dotfiles-nix-32b518b8039857f26e110c903a9ae7a6b453d7dc.tar.bz2 dotfiles-nix-32b518b8039857f26e110c903a9ae7a6b453d7dc.zip | |
unofficial-homestuck-collection: update patches
| -rw-r--r-- | pkgs/unofficial-homestuck-collection/0003-make-compatible-with-native-electron.patch | 14 | ||||
| -rw-r--r-- | pkgs/unofficial-homestuck-collection/default.nix | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/unofficial-homestuck-collection/0003-make-compatible-with-native-electron.patch b/pkgs/unofficial-homestuck-collection/0003-make-compatible-with-native-electron.patch index 49de8df..6bdd030 100644 --- a/pkgs/unofficial-homestuck-collection/0003-make-compatible-with-native-electron.patch +++ b/pkgs/unofficial-homestuck-collection/0003-make-compatible-with-native-electron.patch @@ -1,16 +1,16 @@ -From 0f84aa973f9e2f7fae8980429b59acccfcc09458 Mon Sep 17 00:00:00 2001 +From 0090d934ac8e9cff0ffb24ad4ad1af5fe573ed53 Mon Sep 17 00:00:00 2001 From: Freya Murphy <freya@freyacat.org> Date: Sun, 20 Jul 2025 12:01:12 -0400 Subject: [PATCH 3/3] make compatible with native electron --- - src/background.js | 17 ++++++----------- + src/background.js | 15 +++++---------- src/components/SystemPages/Settings.vue | 12 +++++++----- src/components/UIElements/MediaEmbed.vue | 20 ++------------------ - 3 files changed, 15 insertions(+), 34 deletions(-) + 3 files changed, 14 insertions(+), 33 deletions(-) diff --git a/src/background.js b/src/background.js -index 426a84a..997971a 100644 +index 426a84a..dfbc4e8 100644 --- a/src/background.js +++ b/src/background.js @@ -314,16 +314,8 @@ if (assetDir === undefined) { @@ -32,14 +32,12 @@ index 426a84a..997971a 100644 if (store.has('settings.smoothScrolling') && store.get('settings.smoothScrolling') === false) app.commandLine.appendSwitch('disable-smooth-scrolling') -@@ -747,7 +739,10 @@ async function createWindow () { - titleBarStyle: 'hidden', +@@ -748,6 +740,9 @@ async function createWindow () { autoHideMenuBar: true, webPreferences: { -- nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION, + nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION, + // MOD: disable isolation to get + // collection to work with electron 35 -+ nodeIntegration: true, + contextIsolation: false, enableRemoteModule: true, plugins: true, diff --git a/pkgs/unofficial-homestuck-collection/default.nix b/pkgs/unofficial-homestuck-collection/default.nix index 0fdf05e..5820df5 100644 --- a/pkgs/unofficial-homestuck-collection/default.nix +++ b/pkgs/unofficial-homestuck-collection/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r dist_electron/*-unpacked/{locales,resources{,.pak}} $out/share/unofficial-homestuck-collection makeWrapper ${lib.getExe electron} $out/bin/unofficial-homestuck-collection \ --add-flags $out/share/unofficial-homestuck-collection/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags --no-sandbox \ --set LD_LIBRARY_PATH "${ lib.makeLibraryPath [ |