librecad: fix missing app name and icon on Wayland #71957
Conversation
|
I see you've submitted this upstream: LibreCAD/LibreCAD#1151. Perhaps we can apply some pressure to fix this upstream? |
|
I’ll do what I can.
Since the next release is at RC status this change mightn't ship anytime soon, so it might be worth including the patch in nixpkgs for now.
… On 29 Oct 2019, at 02:56, Bjørn Forsman ***@***.***> wrote:
I see you've submitted this upstream: LibreCAD/LibreCAD#1151 <LibreCAD/LibreCAD#1151>.
Perhaps we can apply some pressure to fix this upstream?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub <#71957?email_source=notifications&email_token=ABA42VHH2TP445K72BKSZ43QQ4DTVA5CNFSM4JE5L3G2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOECNMPUY#issuecomment-547014611>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABA42VDOTQ324C4QX775Q5TQQ4DTVANCNFSM4JE5L3GQ>.
|
lightbulbjim
force-pushed
the
librecad-wayland
branch
from
0f591f3
to
403b5fb
Compare
There was a problem hiding this comment.
I'd like if you run nixpkgs-fmt on it; alternatively git apply :)
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 2d160d93853..6f7967dfdfd 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -17,7 +17,7 @@ let
stdenv = gcc8Stdenv;
in
-# Doesn't build with gcc9
+ # Doesn't build with gcc9
mkDerivationWith stdenv.mkDerivation rec {
pname = "librecad";
version = "2.2.0-rc1";
@@ -31,11 +31,13 @@ mkDerivationWith stdenv.mkDerivation rec {
patches = [
./fix_qt_5_11_build.patch
- (fetchpatch {
- # Fix missing app name and icon on Wayland.
- url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch";
- sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5";
- })
+ (
+ fetchpatch {
+ # Fix missing app name and icon on Wayland.
+ url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch";
+ sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5";
+ }
+ )
];
postPatch = ''
Wayland uses the .desktop file to find the app name and icon. Without it being specified the correct icon is not shown. Tested on Gnome/Wayland. References: - https://community.kde.org/Guidelines_and_HOWTOs/Wayland_Porting_Notes#Application_Icon - https://doc.qt.io/qt-5/qguiapplication.html#desktopFileName-prop
lightbulbjim
force-pushed
the
librecad-wayland
branch
from
403b5fb
to
3a18062
Compare
Sure thing, done. That comment indent looks awkward to me, but no big deal. |
|
Aye. I don't always agree with The Machine but when we disagree it always wins the argument! I'm a huge fan of code formatters. They're much more consistent than I am, with a lot less mental overhead, and it's nice to be able to defer the decision to The Machine about what is correct when it comes to something so subjective (and I don't even always agree with myself!). It helps me stay focused on the problem I'm solving if I don't have to think about how it's formatted as well. If it compiles... format it! I should write about it on my blag... anyway, thanks! 😄 |
|
Hello, I'm a bot and I thank you in the name of the community for your contributions. Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do: If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list. If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past. If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments. Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel. |
stale
bot
added
the
2.status: stale
|
Result of 1 package built:
|
stale
bot
removed
the
2.status: stale
Motivation for this change
Wayland uses the .desktop file to find the app name and icon. Without it being specified the correct icon is not shown. This was broken in the recent update to Qt5 (#69077).
Tested on Gnome/Wayland.
References:
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @viric