summary refs log tree commit diff
path: root/pkgs/desktops/lxqt
diff options
context:
space:
mode:
authorromildo <malaquias@gmail.com>2017-03-26 16:17:42 -0300
committerromildo <malaquias@gmail.com>2017-03-26 16:17:42 -0300
commite2ad762394778627d170a69809e754eb839cd06c (patch)
treea8eb3fbdd7ce3a345f37c0c48fa0a63f03e7318f /pkgs/desktops/lxqt
parentd12635370b4f4b35bedf1938975706b0ec7836f8 (diff)
downloadnixlib-e2ad762394778627d170a69809e754eb839cd06c.tar
nixlib-e2ad762394778627d170a69809e754eb839cd06c.tar.gz
nixlib-e2ad762394778627d170a69809e754eb839cd06c.tar.bz2
nixlib-e2ad762394778627d170a69809e754eb839cd06c.tar.lz
nixlib-e2ad762394778627d170a69809e754eb839cd06c.tar.xz
nixlib-e2ad762394778627d170a69809e754eb839cd06c.tar.zst
nixlib-e2ad762394778627d170a69809e754eb839cd06c.zip
lxqt-panel: fix for `explicit` (a C++11 keyword) being used as variable
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
https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.
Diffstat (limited to 'pkgs/desktops/lxqt')
-rw-r--r--pkgs/desktops/lxqt/core/lxqt-panel/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index dfbd39acaa35..d2faf9c0eee4 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -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,
@@ -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;