about summary refs log tree commit diff
path: root/pkgs/desktops/deepin
diff options
context:
space:
mode:
authorrewine <luhongxu@deepin.org>2023-09-26 15:42:02 +0800
committerrewine <luhongxu@deepin.org>2023-11-23 10:00:29 +0800
commit16c60c99403c073fff288d1b833b119739b106de (patch)
tree88ff3cbbec69aba708b28e6ecb86bd05cb1dc193 /pkgs/desktops/deepin
parentfdc46fb8ec7356b0b0f8bf3f868dedf9d04746ee (diff)
downloadnixlib-16c60c99403c073fff288d1b833b119739b106de.tar
nixlib-16c60c99403c073fff288d1b833b119739b106de.tar.gz
nixlib-16c60c99403c073fff288d1b833b119739b106de.tar.bz2
nixlib-16c60c99403c073fff288d1b833b119739b106de.tar.lz
nixlib-16c60c99403c073fff288d1b833b119739b106de.tar.xz
nixlib-16c60c99403c073fff288d1b833b119739b106de.tar.zst
nixlib-16c60c99403c073fff288d1b833b119739b106de.zip
dde-clipboard: 5.4.25 -> 6.0.7
Diffstat (limited to 'pkgs/desktops/deepin')
-rw-r--r--pkgs/desktops/deepin/core/dde-clipboard/default.nix33
1 files changed, 9 insertions, 24 deletions
diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
index 47ec1c837b13..78f2fd0da6a2 100644
--- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix
+++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
@@ -2,13 +2,13 @@
 , lib
 , fetchFromGitHub
 , dtkwidget
-, qt5integration
-, qt5platform-plugins
-, dde-qt-dbus-factory
 , gio-qt
 , cmake
+, extra-cmake-modules
 , qttools
+, wayland
 , kwayland
+, dwayland
 , pkg-config
 , wrapQtAppsHook
 , glibmm
@@ -17,32 +17,18 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-clipboard";
-  version = "5.4.25";
+  version = "6.0.7";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-oFATOBXf4NvGxjVMlfxwfQkBffeKut8ao+X6T9twb/I=";
+    hash = "sha256-6CbCor0vgVMsMt8KY2uWrNqOsBEIaz7s2nViiHz+m1g=";
   };
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace "/etc/xdg" "$out/etc/xdg" \
-      --replace "/lib/systemd/user" "$out/lib/systemd/user" \
-      --replace "/usr/share" "$out/share"
-
-    substituteInPlace misc/com.deepin.dde.Clipboard.service \
-      --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus"
-
-    substituteInPlace misc/{dde-clipboard.desktop,dde-clipboard-daemon.service,com.deepin.dde.Clipboard.service} \
-      --replace "/usr" "$out"
-
-    patchShebangs translate_generation.sh generate_gtest_report.sh
-  '';
-
   nativeBuildInputs = [
     cmake
+    extra-cmake-modules
     pkg-config
     qttools
     wrapQtAppsHook
@@ -50,17 +36,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     dtkwidget
-    qt5integration
-    qt5platform-plugins
-    dde-qt-dbus-factory
     gio-qt
+    wayland
     kwayland
+    dwayland
     glibmm
     gtest
   ];
 
   cmakeFlags = [
-    "-DUSE_DEEPIN_WAYLAND=OFF"
+    "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
   ];
 
   meta = with lib; {