mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
deepin.dde-grand-search: 5.4.9 -> 5.5.2
This commit is contained in:
parent
bff2d3150f
commit
d0c90c5bd1
@ -16,18 +16,20 @@
|
||||
ffmpeg,
|
||||
ffmpegthumbnailer,
|
||||
pcre,
|
||||
lucenepp,
|
||||
boost,
|
||||
dbus,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-grand-search";
|
||||
version = "5.4.9";
|
||||
version = "5.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-WybwV1QIuV7O1SSgQU1ABsMf5QW9KJ95YyIa8Tz8pJ0=";
|
||||
hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -48,13 +50,14 @@ stdenv.mkDerivation rec {
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
pcre
|
||||
lucenepp
|
||||
boost
|
||||
];
|
||||
|
||||
patches = [
|
||||
# This patch revert the commit e6735e7
|
||||
# FIXME: why StartManager can't work, is dde-api-proxy still required?
|
||||
./fix-dbus-path-for-daemon.diff
|
||||
./patch-check-v23-interface.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -69,10 +72,7 @@ stdenv.mkDerivation rec {
|
||||
substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVERSION=${version}"
|
||||
"-DNIX_DEEPIN_VERSION=23"
|
||||
];
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
meta = {
|
||||
description = "System-wide desktop search for DDE";
|
||||
|
@ -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")
|
Loading…
Reference in New Issue
Block a user