summary refs log tree commit diff
path: root/pkgs/desktops/lxqt
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2017-11-01 23:59:05 -0200
committerJosé Romildo Malaquias <malaquias@gmail.com>2017-11-01 23:59:05 -0200
commit9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0 (patch)
tree935bc5f4e67f044b7a7169df42334fe266933d2d /pkgs/desktops/lxqt
parent1288876ab09a9b1ac90554cdc866ec64b69c5595 (diff)
downloadnixpkgs-9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0.tar
nixpkgs-9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0.tar.gz
nixpkgs-9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0.tar.bz2
nixpkgs-9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0.tar.lz
nixpkgs-9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0.tar.xz
nixpkgs-9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0.tar.zst
nixpkgs-9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0.zip
lxqt-session: 0.11.1 -> 0.12.0
Diffstat (limited to 'pkgs/desktops/lxqt')
-rw-r--r--pkgs/desktops/lxqt/core/lxqt-session/default.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
index ba0bb69ce92..d3733950ed0 100644
--- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-session";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv";
+    sha256 = "03gi9svxqsfjhk5ifbaalq9i44ggx8afwms1hb312czqn82wrszb";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
     kwindowsystem
     liblxqt
     libqtxdg
-    lxqt-common
     xorg.libpthreadstubs
     xorg.libXdmcp
     xdg-user-dirs
@@ -34,6 +33,13 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
+  postPatch = ''
+    for dir in autostart config; do
+      substituteInPlace $dir/CMakeLists.txt \
+        --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "An alternative session manager ported from the original razor-session";
     homepage = https://github.com/lxde/lxqt-session;