deepin.dde-grand-search: 5.4.9 -> 5.5.2

This commit is contained in:
rewine 2024-08-28 11:25:33 +08:00
parent bff2d3150f
commit d0c90c5bd1
2 changed files with 7 additions and 20 deletions

View File

@ -16,18 +16,20 @@
ffmpeg, ffmpeg,
ffmpegthumbnailer, ffmpegthumbnailer,
pcre, pcre,
lucenepp,
boost,
dbus, dbus,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dde-grand-search"; pname = "dde-grand-search";
version = "5.4.9"; version = "5.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-WybwV1QIuV7O1SSgQU1ABsMf5QW9KJ95YyIa8Tz8pJ0="; hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -48,13 +50,14 @@ stdenv.mkDerivation rec {
ffmpeg ffmpeg
ffmpegthumbnailer ffmpegthumbnailer
pcre pcre
lucenepp
boost
]; ];
patches = [ patches = [
# This patch revert the commit e6735e7 # This patch revert the commit e6735e7
# FIXME: why StartManager can't work, is dde-api-proxy still required? # FIXME: why StartManager can't work, is dde-api-proxy still required?
./fix-dbus-path-for-daemon.diff ./fix-dbus-path-for-daemon.diff
./patch-check-v23-interface.diff
]; ];
postPatch = '' postPatch = ''
@ -69,10 +72,7 @@ stdenv.mkDerivation rec {
substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
''; '';
cmakeFlags = [ cmakeFlags = [ "-DVERSION=${version}" ];
"-DVERSION=${version}"
"-DNIX_DEEPIN_VERSION=23"
];
meta = { meta = {
description = "System-wide desktop search for DDE"; description = "System-wide desktop search for DDE";

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76dac13..f43600e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
#Indentify the version
find_package(DtkCMake REQUIRED)
-if (${DEEPIN_OS_VERSION} MATCHES "23")
+if (${NIX_DEEPIN_VERSION} MATCHES "23")
add_definitions(-DCOMPILE_ON_V23)
set(COMPLIE_ON_V23 TRUE)
message("COMPILE ON v23")