Skip to content

Commit

Permalink
lxqt-panel: fix for explicit (a C++11 keyword) being used as variable
Browse files Browse the repository at this point in the history
It is needed to override "explicit" as this is a C++ keyword. But it
is used as variable name in xkb.h. This is causing a failure in C++
compile time.  Similar bug here:
https://bugs.freedesktop.org/show_bug.cgi?id=74080

Workaround from
lxqt/lxqt-panel@ec62109.

(cherry picked from commit e2ad762)
  • Loading branch information
romildo authored and bjornfor committed Apr 14, 2017
1 parent 9f64797 commit 76c6313
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion pkgs/desktops/lxqt/core/lxqt-panel/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
stdenv, fetchFromGitHub, standardPatch,
stdenv, fetchFromGitHub, fetchurl, standardPatch,
cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
Expand Down Expand Up @@ -49,6 +49,13 @@ stdenv.mkDerivation rec {
lxmenu-data
];

patches = [
(fetchurl {
url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr";
})
];

cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

postPatch = standardPatch;
Expand Down

0 comments on commit 76c6313

Please sign in to comment.