dorion: 5.0.1 → 6.2.0; dorion: build from source #265771

nyabinary · 2023-11-06T03:16:46Z

Description of changes

Build from source
Tauri patched to remove its hard-coded resource directory
Enable WebkitGTK Experimental toggle for WebRTC (To make VCs work)
Added myself to maintainer
Depends on #280554
Obligatory: #327063

Closes #360644

Things done

Huge thanks to @lilyinstarlight this PR wouldn't be possible without her.

pbsds

Impressive! Considering SpikeHD/Dorion#125 is a thing, I consider this PR a ZHF fix. #265948
Runs fine, but a bit more sluggish than the official client. Likely a tauri issue.

pkgs/by-name/do/dorion/package.nix

pbsds

Sorry for appearing nitpicky, you have done an excellent job. The proposed set of substitutions IMO clearly convey their intent

pkgs/by-name/do/dorion/package.nix

pbsds

We seem to have a build failure, the proposed fix works on my end

pkgs/by-name/do/dorion/package.nix

pbsds · 2023-11-19T00:13:06Z

More build failures: unable to parse JSON Tauri config file at /build/source/src-tauri/tauri.conf.json because trailing comma at line 71 column 7

nyabinary · 2023-11-19T01:33:26Z

More build failures: unable to parse JSON Tauri config file at /build/source/src-tauri/tauri.conf.json because trailing comma at line 71 column 7

pain
what could be causing this tho?

pkgs/by-name/do/dorion/package.nix

nyabinary · 2024-10-06T21:06:48Z

There is a permission error now that I can't seem to solve if anyone wants to chip in :P

pkgs/by-name/do/dorion/package.nix

getchoo

TL;DR: Try moving this to cargo-tauri.hook. It should make some things here much easier

getchoo · 2024-11-17T02:48:42Z

pkgs/by-name/do/dorion/package.nix

-    libappindicator
-    libayatana-appindicator
-  ];
+  frontend = stdenv.mkDerivation {


I wouldn't recommend splitting this derivation. In most cases, it's much easier to pull pnpmDeps, pnpm.configHook, etc., into the main derivation and let cargo-tauri build as intended. You can see an example of this in the test app

getchoo · 2024-11-17T02:49:27Z

pkgs/by-name/do/dorion/package.nix

+  runtimeDependencies = [
+    libappindicator
+    libayatana-appindicator
+  ];


Tauri apps will only use one or the other, so there's no need to have both of these. I believe the upstream recommendation is libayatana-appindicator

We also shouldn't be using patchelf here at all as we are compiling from source. Instead, we can patch the crate to use the proper path like this

getchoo · 2024-11-17T02:51:06Z

pkgs/by-name/do/dorion/package.nix

+        .build.beforeBuildCommand = "" |
+        .build.frontendDist = "src" |


Suggested change

.build.beforeBuildCommand = "" |

.build.frontendDist = "src" |

These should be able to be removed when using cargo-tauri.hook

getchoo · 2024-11-17T02:51:24Z

pkgs/by-name/do/dorion/package.nix

+  postInstall = ''
+    mkdir -p $out/lib/dorion
+    cp -r {injection,html} $out/lib/dorion
+    install -Dm644 "$out/share/icons/hicolor/32x32/apps/dorion.png" "./${src.name}/src-tauri/icons/32x32icon.png"
+    install -Dm644 "$out/share/icons/hicolor/128x128/apps/dorion.png" "./${src.name}/src-tauri/icons/128x128.png"
+    install -Dm644 "$out/share/icons/hicolor/256x256/apps/dorion.png" "./${src.name}/src-tauri/icons/[email protected]"
+    install -Dm644 "$out/share/icons/hicolor/512x512/apps/dorion.png" "./${src.name}/src-tauri/icons/icon.png"


getchoo · 2024-11-17T02:52:16Z

pkgs/by-name/do/dorion/package.nix

+  desktopItems = [
+    (makeDesktopItem {
+      name = "dorion";
+      genericName = "Internet Messenger";
+      desktopName = "Dorion";
+      exec = "dorion %U";
+      tryExec = "dorion %U";
+      icon = "dorion";
+      comment = "Tiny alternative Discord client";
+      keywords = [
+        "discord"
+        "vencord"
+        "tauri"
+        "chat"
+      ];
+      categories = [
+        "Network"
+        "InstantMessaging"
+        "Chat"
+      ];
+      mimeTypes = [ "x-scheme-handler/discord" ];
+      startupWMClass = "Dorion";
+      terminal = false;
+    })
+  ];


ditto -- though, you may still want to final one as Tauri's generated .desktop files may be lacking in metainfo. See

nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix

Lines 75 to 89 in cd43d68

postInstall =

lib.optionalString stdenv.hostPlatform.isDarwin ''

mkdir -p "$out"/bin

mv "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/modrinth-app

ln -s "$out"/bin/modrinth-app "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App

''

+ lib.optionalString stdenv.hostPlatform.isLinux ''

desktop-file-edit \

--set-comment "Modrinth's game launcher" \

--set-key="StartupNotify" --set-value="true" \

--set-key="Categories" --set-value="Game;ActionGame;AdventureGame;Simulation;" \

--set-key="Keywords" --set-value="game;minecraft;mc;" \

--set-key="StartupWMClass" --set-value="ModrinthApp" \

$out/share/applications/modrinth-app.desktop

'';

for example

nyabinary · 2024-11-17T16:04:43Z

TL;DR: Try moving this to cargo-tauri.hook. It should make some things here much easier

I thought that supported only Tauri v1? Dorion is using Tauri v2 currently.

EDIT: Nvm, saw V2 support got merged recently.

nyabinary · 2024-11-18T04:23:45Z

Def doing something wrong, but what me and @griffi-gh has so far :3

getchoo · 2024-11-19T06:20:23Z

pkgs/by-name/do/dorion/package.nix

+  runtimeDependencies = [
+    libayatana-appindicator
+  ];


Suggested change

runtimeDependencies = [

libayatana-appindicator

];

getchoo · 2024-11-19T06:20:29Z

pkgs/by-name/do/dorion/package.nix

    gst_all_1.gst-plugins-bad
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
-    webkitgtk_4_0
+    glib-networking
+    libayatana-appindicator


Suggested change

libayatana-appindicator

getchoo · 2024-11-19T06:20:57Z

pkgs/by-name/do/dorion/package.nix

  ];

  buildInputs = [
-    glib-networking
+    openssl
+    webkitgtk_4_1


Some of these dependencies should be optional if this app supports both Linux and Darwin

getchoo · 2024-11-19T06:21:19Z

pkgs/by-name/do/dorion/package.nix

    wrapGAppsHook3
+    yq-go
+    desktop-file-utils
+    copyDesktopItems


Suggested change

copyDesktopItems

No longer needed since we're editing the generated file

getchoo · 2024-11-19T06:22:40Z

pkgs/by-name/do/dorion/package.nix

+    maintainers = with lib.maintainers; [
+      nyabinary
+      aleksana
+      griffi-gh


Suggested change

griffi-gh

griffi-gh

getchoo

Feel free to add me as well. I like this as an edge case for cargo-tauri.hook

gepbird · 2025-01-15T15:44:01Z

pkgs/by-name/do/dorion/package.nix

+  openssl,
+  pkg-config,
+  yq-go,
+  pnpm,


Most likely you need to change pnpm to pnpm_9. Since #371832, it points to pnpm_10 instead of pnpm_9.

isn't it backwards compatible?

Unfortunately no.

The format how pnpm stores packages has changed, therefore the pnpm hash will change as well.
And while trying to update a package to use pnpm_10, I ran into a few issues, because the lockfile version was too old.

In order to use pnpm_10, preferably we should wait until upstream updates their lockfile version, currently it's 9.0: https://github.com/SpikeHD/Dorion/blob/75766694deb9c11b9a990ec948be4034e0db4a67/pnpm-lock.yaml#L1.

Co-authored-by: griffi-gh <[email protected]> Co-authored-by: nyabinary <[email protected]>

ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 6, 2023

nyabinary force-pushed the dorion branch 3 times, most recently from 25a8866 to 3054e22 Compare November 10, 2023 01:38

pbsds reviewed Nov 10, 2023

View reviewed changes

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/do/dorion/package.nix Show resolved Hide resolved

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved

nyabinary force-pushed the dorion branch from 3054e22 to e3310d7 Compare November 10, 2023 01:39

nyabinary changed the title ~~dorion: 1.2.1 -> 2.1.0~~ dorion: 1.2.1 -> 2.2.0 Nov 10, 2023

nyabinary force-pushed the dorion branch from e3310d7 to 2dec2d6 Compare November 10, 2023 21:20

nyabinary changed the title ~~dorion: 1.2.1 -> 2.2.0~~ dorion: 1.2.1 -> 2.2.1 Nov 10, 2023

nyabinary force-pushed the dorion branch 2 times, most recently from 5c825e5 to 1fd5b9b Compare November 12, 2023 22:47

pbsds reviewed Nov 13, 2023

View reviewed changes

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved

nyabinary force-pushed the dorion branch 2 times, most recently from 39c423b to 0b33e13 Compare November 13, 2023 15:50

nyabinary requested review from pbsds and lilyinstarlight November 15, 2023 16:22

pbsds reviewed Nov 18, 2023

View reviewed changes

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved

nyabinary force-pushed the dorion branch from 0b33e13 to ad43eee Compare November 18, 2023 21:05

pbsds reviewed Nov 19, 2023

View reviewed changes

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved

nyabinary marked this pull request as draft December 19, 2023 15:21

wegank changed the title ~~dorion: 1.2.1 -> 2.2.1~~ dorion: 1.2.1 -> 2.2.1, build from source Jan 3, 2024

wegank mentioned this pull request Jan 3, 2024

Update request: dorion 1.2.1 → 2.1.0 #260737

Closed

1 task

nyabinary force-pushed the dorion branch 2 times, most recently from a1ed935 to 68a67f3 Compare January 12, 2024 15:45

nyabinary force-pushed the dorion branch 2 times, most recently from ba533da to 076a860 Compare October 6, 2024 16:13

nyabinary changed the title ~~dorion: build from source~~ dorion: 5.0.1 → 5.1.0; dorion: build from source Oct 6, 2024

nyabinary force-pushed the dorion branch from 076a860 to 24294e2 Compare October 6, 2024 20:58

nyabinary marked this pull request as draft October 14, 2024 20:49

nyabinary force-pushed the dorion branch 3 times, most recently from f3d7371 to a78c369 Compare October 14, 2024 23:56

nyabinary changed the title ~~dorion: 5.0.1 → 5.1.0; dorion: build from source~~ dorion: 5.0.1 → 5.2.0; dorion: build from source Oct 15, 2024

Scrumplex reviewed Oct 20, 2024

View reviewed changes

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved

nyabinary force-pushed the dorion branch from a78c369 to 3d41a20 Compare October 20, 2024 19:45

nyabinary force-pushed the dorion branch 2 times, most recently from d2d073d to 053b2e3 Compare November 17, 2024 00:23

getchoo requested changes Nov 17, 2024

View reviewed changes

nyabinary force-pushed the dorion branch from 053b2e3 to 79bd334 Compare November 18, 2024 04:22

ofborg bot requested a review from griffi-gh November 18, 2024 16:41

getchoo requested changes Nov 19, 2024

View reviewed changes

getchoo added the backport release-24.11 Backport PR automatically label Nov 19, 2024

Aleksanaa changed the title ~~dorion: 5.0.1 → 5.2.0; dorion: build from source~~ dorion: 5.0.1 → 6.2.0; dorion: build from source Dec 1, 2024

gepbird reviewed Jan 15, 2025

View reviewed changes

griffi-gh force-pushed the dorion branch 5 times, most recently from 669aeab to 835761c Compare January 22, 2025 02:59

dorion: 5.0.1 -> 6.4.1; dorion: build from source

666ecfe

Co-authored-by: griffi-gh <[email protected]> Co-authored-by: nyabinary <[email protected]>

griffi-gh force-pushed the dorion branch from 835761c to 666ecfe Compare January 22, 2025 04:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dorion: 5.0.1 → 6.2.0; dorion: build from source #265771

dorion: 5.0.1 → 6.2.0; dorion: build from source #265771

nyabinary commented Nov 6, 2023 •

edited by Aleksanaa

Loading

pbsds left a comment •

edited

Loading

pbsds left a comment

pbsds left a comment

pbsds commented Nov 19, 2023

nyabinary commented Nov 19, 2023

nyabinary commented Oct 6, 2024

getchoo left a comment

getchoo Nov 17, 2024

getchoo Nov 17, 2024

getchoo Nov 17, 2024

getchoo Nov 17, 2024

getchoo Nov 17, 2024

nyabinary commented Nov 17, 2024 •

edited

Loading

nyabinary commented Nov 18, 2024 •

edited

Loading

getchoo Nov 19, 2024

getchoo Nov 19, 2024

getchoo Nov 19, 2024

getchoo Nov 19, 2024

getchoo Nov 19, 2024

gepbird Jan 15, 2025

griffi-gh Jan 15, 2025

gepbird Jan 15, 2025 •

edited

Loading

		.build.beforeBuildCommand = "" \|
		.build.frontendDist = "src" \|

	postInstall =
	lib.optionalString stdenv.hostPlatform.isDarwin ''
	mkdir -p "$out"/bin
	mv "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/modrinth-app
	ln -s "$out"/bin/modrinth-app "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App
	''
	+ lib.optionalString stdenv.hostPlatform.isLinux ''
	desktop-file-edit \
	--set-comment "Modrinth's game launcher" \
	--set-key="StartupNotify" --set-value="true" \
	--set-key="Categories" --set-value="Game;ActionGame;AdventureGame;Simulation;" \
	--set-key="Keywords" --set-value="game;minecraft;mc;" \
	--set-key="StartupWMClass" --set-value="ModrinthApp" \
	$out/share/applications/modrinth-app.desktop
	'';

dorion: 5.0.1 → 6.2.0; dorion: build from source #265771

Are you sure you want to change the base?

dorion: 5.0.1 → 6.2.0; dorion: build from source #265771

Conversation

nyabinary commented Nov 6, 2023 • edited by Aleksanaa Loading

Description of changes

Things done

pbsds left a comment • edited Loading

Choose a reason for hiding this comment

pbsds left a comment

Choose a reason for hiding this comment

pbsds left a comment

Choose a reason for hiding this comment

pbsds commented Nov 19, 2023

nyabinary commented Nov 19, 2023

nyabinary commented Oct 6, 2024

getchoo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nyabinary commented Nov 17, 2024 • edited Loading

nyabinary commented Nov 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gepbird Jan 15, 2025 • edited Loading

Choose a reason for hiding this comment

nyabinary commented Nov 6, 2023 •

edited by Aleksanaa

Loading

pbsds left a comment •

edited

Loading

nyabinary commented Nov 17, 2024 •

edited

Loading

nyabinary commented Nov 18, 2024 •

edited

Loading

gepbird Jan 15, 2025 •

edited

Loading