diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2017-11-01 23:57:11 -0200 |
---|---|---|
committer | José Romildo Malaquias <malaquias@gmail.com> | 2017-11-01 23:57:11 -0200 |
commit | 9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e (patch) | |
tree | b2507b792a753075d678c4a7c635fbc4ab222db1 | |
parent | 530f8e820b5beeedd21003b96aed531e1dffa8d9 (diff) | |
download | nixlib-9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e.tar nixlib-9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e.tar.gz nixlib-9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e.tar.bz2 nixlib-9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e.tar.lz nixlib-9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e.tar.xz nixlib-9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e.tar.zst nixlib-9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e.zip |
lxqt-panel: 0.11.1 -> 0.12.0
-rw-r--r-- | pkgs/desktops/lxqt/core/lxqt-panel/default.nix | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index d2faf9c0eee4..1a357f1d0fe8 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,22 +1,22 @@ { - stdenv, fetchFromGitHub, fetchurl, standardPatch, + stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, - kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, + kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data + lxmenu-data, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-panel"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y"; + sha256 = "01xmnb17jpydyfvxwaa6kymzdasnyd94z62gjah8y4pzsmykcr4x"; }; nativeBuildInputs = [ @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { kguiaddons liblxqt libqtxdg - lxqt-common lxqt-globalkeys libsysstat xorg.libpthreadstubs @@ -47,18 +46,19 @@ stdenv.mkDerivation rec { alsaLib menu-cache lxmenu-data - ]; - - patches = [ - (fetchurl { - url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch; - sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr"; - }) + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + for dir in autostart menu; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + substituteInPlace panel/CMakeLists.txt \ + --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" + ''; meta = with stdenv.lib; { description = "The LXQt desktop panel"; |