From 2f0a5d14e5d7aa237e386fae8fe1c5c2b6817119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:55:19 -0200 Subject: [PATCH] lxqt-globalkeys: 0.11.1 -> 0.12.0 --- .../lxqt/core/lxqt-globalkeys/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix index 73248da1ef8..9e74eee5ec1 100644 --- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-globalkeys"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h"; + sha256 = "14icyik9x47wi3gfkmkyhag26a2ivyc42f4f8qwdgbr3dcg10b9a"; }; nativeBuildInputs = [ @@ -29,7 +29,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + for dir in autostart xdg; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; meta = with stdenv.lib; { description = "Daemon used to register global keyboard shortcuts";