public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lxqt-panel: fix for explicit (a C++11 keyword) being used as variable

Browse Source 
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
ec62109e0f.
This commit is contained in:
romildo 2017-03-26 16:17:42 -03:00
parent d12635370b
commit e2ad762394
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/lxqt/core/lxqt-panel/default.nix
View File

@ -1,5 +1,5 @@
{ {
stdenv, fetchFromGitHub, standardPatch, stdenv, fetchFromGitHub, fetchurl, standardPatch,
cmake, pkgconfig, lxqt-build-tools, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
@ -49,6 +49,13 @@ stdenv.mkDerivation rec {
lxmenu-data lxmenu-data
]; ];
patches = [
(fetchurl {
url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr";
})
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch; postPatch = standardPatch;