From 3a18062a441498f165e95fdc88da33af49dbf7d5 Mon Sep 17 00:00:00 2001 From: Chris Rendle-Short Date: Fri, 10 Jan 2020 21:52:11 +1100 Subject: librecad: fix missing app name and icon on Wayland 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 --- pkgs/applications/misc/librecad/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 0df0f86ef45..6f7967dfdfd 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,5 +1,6 @@ { boost , fetchFromGitHub +, fetchpatch , installShellFiles , mkDerivationWith , muparser @@ -16,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"; @@ -30,6 +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"; + } + ) ]; postPatch = '' -- cgit 1.4.1