Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deltatouch: init at 1.4.0 #289642

Merged
merged 2 commits into from Apr 11, 2024
Merged

deltatouch: init at 1.4.0 #289642

merged 2 commits into from Apr 11, 2024

Conversation

link2xt
Copy link
Contributor

@link2xt link2xt commented Feb 18, 2024

Description of changes

This is an initial commit for DeltaTouch Delta Chat client.
It is a Delta Chat client for Ubuntu Touch, available at OpenStore.

Things done

Built on x86_64-linux (Arch Linux with Nix installed via Determinate Nix Installer).

Having correct icons requires installing qt5ct in the profile and selecting "suru" icon theme.
Tested by running:

$ nix profile install nixpkgs#qt5ct nixpkgs#lomiri.suru-icon-theme
$ export QT_QPA_PLATFORMTHEME=qt5ct
$ qt5ct # select Suru icon theme
$ nix run github:guibou/nixGL#nixGLIntel -- nix shell .#deltatouch

This is how it looks like:
1
It is possible to configure account, send and receive messages. File selection dialog currently does not work outside of Lomiri desktop environment and I am not running the whole Lomiri, but it is usable anyway.

@OPNA2608
Copy link
Contributor

Lomiri in NixOS is 1-2 PRs away so I wanna give this a look, will give a review when I have some spare time.

@OPNA2608 OPNA2608 self-assigned this Feb 29, 2024
Copy link
Contributor

@OPNA2608 OPNA2608 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Welcome to Nixpkgs! Haven't tried to build yet, but here are some initial notes.

Also to consider:

  • finalAttrs style instead of rec style. Just grep Nixpkgs for some examples.
  • Can we do without needing to copy-paste libraries into the build & output tree? Either patching the CMake script to link against system-supplied versions, or at least replacing the ones in the output tree with symlinks to the originals?

pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
@link2xt link2xt force-pushed the init-deltatouch branch 2 times, most recently from 242f926 to 5944619 Compare February 29, 2024 17:26
@link2xt link2xt changed the title deltatouch: init at unstable deltatouch: init at 1.3.1-unstable-2024-02-25 Mar 1, 2024
@link2xt
Copy link
Contributor Author

link2xt commented Mar 1, 2024

  • finalAttrs style instead of rec style. Just grep Nixpkgs for some examples.

There is no need for rec, so I simply removed it.

Copy link
Contributor

@OPNA2608 OPNA2608 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Launches fine:
Bildschirmfoto_2024-03-01_14-54-32

With the suggested changes, localisation works partially (large parts seem untranslated):
Bildschirmfoto_2024-03-01_15-51-02

pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Show resolved Hide resolved
@link2xt link2xt changed the title deltatouch: init at 1.3.1-unstable-2024-02-25 deltatouch: init at 1.4.0-unstable-2024-03-08 Mar 8, 2024
@link2xt
Copy link
Contributor Author

link2xt commented Mar 8, 2024

Would be nice to also merge #289215 first to update libdeltachat. But it is not a blocker, deltatouch works with old libdeltachat too.

@dotlambda
Copy link
Member

I think the version should be 1.3.1-unstable-... because 1.3.1 is the last version from before the commit.

@link2xt
Copy link
Contributor Author

link2xt commented Mar 9, 2024

I think the version should be 1.3.1-unstable-... because 1.3.1 is the last version from before the commit.

There is a "prepare 1.4.0" commit. The tag is missing. cc @lk108 did you forgot to push the tag or will you tag some later commit with 1.4.0?

@lk108
Copy link

lk108 commented Mar 9, 2024

There is a "prepare 1.4.0" commit. The tag is missing. cc @lk108 did you forgot to push the tag or will you tag some later commit with 1.4.0?

I'm sorry, the tag should be there now.

@link2xt
Copy link
Contributor Author

link2xt commented Mar 9, 2024

So now the title of this PR is valid, it is 1.4.0

@link2xt link2xt force-pushed the init-deltatouch branch 2 times, most recently from 0d84c51 to 7c8b4f3 Compare March 9, 2024 20:11
@link2xt link2xt changed the title deltatouch: init at 1.4.0-unstable-2024-03-08 deltatouch: init at 1.4.0 Mar 21, 2024
@dotlambda
Copy link
Member

dotlambda commented Mar 25, 2024

How do I add a new account?
image
This is on GNOME btw.

@lk108
Copy link

lk108 commented Mar 25, 2024

How do I add a new account?

You don't see the necessary icons, quote from link2xt above:
$ nix profile install nixpkgs#qt5ct nixpkgs#lomiri.suru-icon-theme
$ export QT_QPA_PLATFORMTHEME=qt5ct
$ qt5ct # select Suru icon theme

@link2xt
Copy link
Contributor Author

link2xt commented Mar 25, 2024

How do I add a new account?

There is a "settings" icon in the top right corner, you don't see it because need to configure icons with qt5ct as described in the top post.

@lk108
Copy link

lk108 commented Mar 25, 2024

Actually, the "+" icon is used to set up a new account

@link2xt
Copy link
Contributor Author

link2xt commented Mar 25, 2024

This is how account screen should look like:
deltatouch-accounts

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works well with the hints. I didn't test translations etc though.

Selecting the Suru icon theme in qt5ct was not necessary btw.

Copy link
Contributor

@OPNA2608 OPNA2608 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is fine with you, considering there was some uncertainty about the patch.

pkgs/by-name/de/deltatouch/package.nix Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/de/deltatouch/package.nix Outdated Show resolved Hide resolved
@link2xt
Copy link
Contributor Author

link2xt commented Apr 10, 2024

I tested, still works.

link2xt and others added 2 commits April 10, 2024 19:55
Co-authored-by: matthewcroughan <matt@croughan.sh>
Co-authored-by: Cosima Neidahl <opna2608@protonmail.com>
@link2xt
Copy link
Contributor Author

link2xt commented Apr 10, 2024

Rebased another time because of dbc967d

Copy link
Contributor

@OPNA2608 OPNA2608 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of nixpkgs-review pr 289642 run on x86_64-linux 1

1 package built:
  • deltatouch

LGTM! Thanks for sticking through with all the reviews and back n forth!

@OPNA2608 OPNA2608 merged commit 865ce9d into NixOS:master Apr 11, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants