summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2020-12-18 10:57:32 +0200
committerGitHub <noreply@github.com>2020-12-18 10:57:32 +0200
commitf6f29071457678d49eabb82959eb5d1d112d67c0 (patch)
treeb2534cc902bc507a4f1698419156e6c23d0d08a7
parent5277b1d12347e261ddef0f7ee1f2ca5c9ba2bd86 (diff)
parent3a18062a441498f165e95fdc88da33af49dbf7d5 (diff)
Merge pull request #71957 from lightbulbjim/librecad-wayland
librecad: fix missing app name and icon on Wayland
-rw-r--r--pkgs/applications/misc/librecad/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 0df0f86ef456..6f7967dfdfd5 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 = ''