diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2017-11-01 23:54:59 -0200 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2017-11-01 23:54:59 -0200 |
| commit | e54f761cd99051424f90b103ccd4c54010f614bd (patch) | |
| tree | b21bf59c28f559e04449a9aaf647de93b787eb7d /pkgs/desktops/lxqt | |
| parent | 7f3576f2ddbf3be599e94643f253f8159d330970 (diff) | |
| download | nixlib-e54f761cd99051424f90b103ccd4c54010f614bd.tar nixlib-e54f761cd99051424f90b103ccd4c54010f614bd.tar.gz nixlib-e54f761cd99051424f90b103ccd4c54010f614bd.tar.bz2 nixlib-e54f761cd99051424f90b103ccd4c54010f614bd.tar.lz nixlib-e54f761cd99051424f90b103ccd4c54010f614bd.tar.xz nixlib-e54f761cd99051424f90b103ccd4c54010f614bd.tar.zst nixlib-e54f761cd99051424f90b103ccd4c54010f614bd.zip | |
lxqt-config: 0.11.1 -> 0.12.0
Diffstat (limited to 'pkgs/desktops/lxqt')
| -rw-r--r-- | pkgs/desktops/lxqt/core/lxqt-config/default.nix | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix index 20e785ec5fda..191fe0796e88 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -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"; - }) - ]; - } |