pyrox.dev
Merge pull request #248355 from wineee/image-editor
deepin.image-editor: 1.0.24 -> 1.0.32
authored by
Weijia Wang
and committed by
GitHub
1348b1fd
26327395
+5
-17
pkgs/desktops/deepin/library/image-editor/default.nix
+5
-17
pkgs/desktops/deepin/library/image-editor/default.nix
···
1
1
{ stdenv
2
2
, lib
3
3
, fetchFromGitHub
4
-
, fetchpatch
5
4
, dtkwidget
6
5
, cmake
7
6
, qttools
···
16
15
17
16
stdenv.mkDerivation rec {
18
17
pname = "image-editor";
19
-
version = "1.0.24";
18
+
version = "1.0.32";
20
19
21
20
src = fetchFromGitHub {
22
21
owner = "linuxdeepin";
23
22
repo = pname;
24
23
rev = version;
25
-
sha256 = "sha256-0p/aicuBfaEyvfZomnz49IJLospWIdl23ZreDe+Bzqc=";
24
+
hash = "sha256-mA2pqWXa3i19jCymvUXnG6YUVezDSfRkHx2EoxAhnqU=";
26
25
};
27
26
28
-
patches = [
29
-
(fetchpatch {
30
-
name = "feat_check_PREFIX_value_before_set.patch";
31
-
url = "https://github.com/linuxdeepin/image-editor/commit/dae86e848cf53ba0ece879d81e8d5335d61a7473.patch";
32
-
sha256 = "sha256-lxmR+nIrMWVyhl1jpA17x2yqJ40h5vnpqKKcjd8j9RY=";
33
-
})
34
-
(fetchpatch {
35
-
name = "feat_use_FULL_install_path.patch";
36
-
url = "https://github.com/linuxdeepin/image-editor/commit/855ae53a0444ac628aa0fe893932df6263b82e2e.patch";
37
-
sha256 = "sha256-3Dynlwl/l/b6k6hOHjTdoDQ/VGBDfyRz9b8QY8FEsCc=";
38
-
})
39
-
];
40
-
41
27
postPatch = ''
42
28
substituteInPlace libimageviewer/service/ffmpegvideothumbnailer.cpp \
43
29
--replace 'libPath("libffmpegthumbnailer.so")' 'QString("${ffmpegthumbnailer.out}/lib/libffmpegthumbnailer.so")'
···
57
43
pcre
58
44
];
59
45
60
-
cmakeFlags = [ "-DVERSION=${version}" ];
46
+
cmakeFlags = [
47
+
"-DCMAKE_INSTALL_LIBDIR=lib"
48
+
];
61
49
62
50
meta = with lib; {
63
51
description = "Image editor lib for dtk";