diff options
| author | Chris Rendle-Short <chris@killred.net> | 2020-01-10 21:52:11 +1100 |
|---|---|---|
| committer | Chris Rendle-Short <chris@killred.net> | 2020-01-23 08:37:15 +1100 |
| commit | 3a18062a441498f165e95fdc88da33af49dbf7d5 (patch) | |
| tree | 1f0cf2e90bf898b6758ba3ed083c404570bb6f53 | |
| parent | fe414f371fec215e8a2f0a674883bd68e6d5d371 (diff) | |
| download | nixpkgs-3a18062a441498f165e95fdc88da33af49dbf7d5.tar nixpkgs-3a18062a441498f165e95fdc88da33af49dbf7d5.tar.gz nixpkgs-3a18062a441498f165e95fdc88da33af49dbf7d5.tar.bz2 nixpkgs-3a18062a441498f165e95fdc88da33af49dbf7d5.tar.lz nixpkgs-3a18062a441498f165e95fdc88da33af49dbf7d5.tar.xz nixpkgs-3a18062a441498f165e95fdc88da33af49dbf7d5.tar.zst nixpkgs-3a18062a441498f165e95fdc88da33af49dbf7d5.zip | |
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
| -rw-r--r-- | pkgs/applications/misc/librecad/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
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 = '' |