pyrox.dev
dde-file-manager: 6.0.23 -> 6.0.31
+15
-3
pkgs/desktops/deepin/core/dde-file-manager/default.nix
+15
-3
pkgs/desktops/deepin/core/dde-file-manager/default.nix
···
1
1
{ stdenv
2
2
, lib
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, runtimeShell
5
6
, dtkwidget
6
7
, qt5integration
···
38
39
, pcre
39
40
, udisks2
40
41
, libisoburn
42
+
, gsettings-qt
41
43
}:
42
44
43
45
stdenv.mkDerivation rec {
44
46
pname = "dde-file-manager";
45
-
version = "6.0.23";
47
+
version = "6.0.31";
46
48
47
49
src = fetchFromGitHub {
48
50
owner = "linuxdeepin";
49
51
repo = pname;
50
52
rev = version;
51
-
hash = "sha256-H+pCWZ1jj5p3gOKXYyLxSmjCMv5/BPIz5A25JGGzrR8=";
53
+
hash = "sha256-mc2HcoLrwMXKU8w34KUEh62ZfEIfbJLVzz4JGnUE5EM=";
52
54
};
53
55
54
56
nativeBuildInputs = [
···
60
62
];
61
63
dontWrapGApps = true;
62
64
65
+
patches = [
66
+
./use_v23_dbus_interface.diff
67
+
68
+
(fetchpatch {
69
+
name = "use-pkgconfig-to-check-mount.patch";
70
+
url = "https://github.com/linuxdeepin/dde-file-manager/commit/b6c210057d991591df45b80607a614e7a57a9dc0.patch";
71
+
hash = "sha256-k0ZYlOVN3hHs1qvvRaJ3i6okOhDE+DoUKGs9AhSFBGU=";
72
+
})
73
+
];
74
+
63
75
postPatch = ''
64
76
patchShebangs .
65
77
···
115
127
pcre
116
128
udisks2
117
129
libisoburn
130
+
gsettings-qt
118
131
];
119
132
120
133
cmakeFlags = [
121
134
"-DVERSION=${version}"
122
-
"-DDEEPIN_OS_VERSION=20"
123
135
];
124
136
125
137
enableParallelBuilding = true;
+13
pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff
+13
pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff
···
1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+
index e93d3ad..94e3eca 100644
3
+
--- a/CMakeLists.txt
4
+
+++ b/CMakeLists.txt
5
+
@@ -30,7 +30,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
6
+
endif()
7
+
8
+
#Indentify the version
9
+
-if (${DEEPIN_OS_VERSION} MATCHES "23")
10
+
+if (TRUE)
11
+
add_definitions(-DCOMPILE_ON_V23)
12
+
set(COMPLIE_ON_V23 TRUE)
13
+
message("COMPILE ON v23")