lxqt-config: 0.11.1 -> 0.12.0

This commit is contained in:
José Romildo Malaquias 2017-11-01 23:54:59 -02:00
parent 7f3576f2dd
commit e54f761cd9
1 changed files with 8 additions and 13 deletions

View File

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-config";
version = "0.11.1";
version = "0.12.0";
srcs = fetchFromGitHub {
src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx";
sha256 = "1ccxkdfhgf40jxiy0132yr9b28skvs9yr8j75w663hnqi6ccn377";
};
nativeBuildInputs = [
@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch;
postPatch = ''
substituteInPlace src/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
meta = with stdenv.lib; {
description = "Tools to configure LXQt and the underlying operating system";
@ -46,12 +49,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ romildo ];
};
patches = [
# Fixes a FTBFS with CMake v3.8
(fetchpatch {
url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch;
sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf";
})
];
}