Skip to content

Commit 8b41a1a

Browse files
authored
Merge pull request #275785 from wineee/deepin-screen-recorder
deepin.deepin-screen-recorder: unstable-2023-07-10 -> 6.0.6
2 parents 18cb69f + 8bc0c34 commit 8b41a1a

File tree

1 file changed

+14
-14
lines changed
  • pkgs/desktops/deepin/apps/deepin-screen-recorder

1 file changed

+14
-14
lines changed

pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
, dtkwidget
99
, qt5integration
1010
, dde-qt-dbus-factory
11-
, dde-dock
1211
, qtbase
1312
, qtmultimedia
1413
, qtx11extras
@@ -27,22 +26,27 @@
2726

2827
stdenv.mkDerivation rec {
2928
pname = "deepin-screen-recorder";
30-
version = "unstable-2023-07-10";
29+
version = "6.0.6";
3130

3231
src = fetchFromGitHub {
3332
owner = "linuxdeepin";
3433
repo = pname;
35-
rev = "e8ee1e8330e2f3923e22acc952a0bd01bee94ad1";
36-
hash = "sha256-QHV3hSALXI4e31YBDXRSRgT8b/J8gwm024bzlPWu2FA=";
34+
rev = version;
35+
hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko=";
3736
};
3837

39-
patches = [ ./dont_use_libPath.diff ];
38+
patches = [
39+
./dont_use_libPath.diff
40+
];
4041

42+
# disable dock plugins, it's part of dde-shell now
4143
postPatch = ''
44+
substituteInPlace screen_shot_recorder.pro \
45+
--replace-fail " src/dde-dock-plugins" ""
4246
(
4347
shopt -s globstar
4448
substituteInPlace **/*.pro **/*.service **/*.desktop \
45-
--replace "/usr/" "$out/"
49+
--replace-quiet "/usr/" "$out/"
4650
)
4751
'';
4852

@@ -56,7 +60,6 @@ stdenv.mkDerivation rec {
5660
buildInputs = [
5761
dtkwidget
5862
dde-qt-dbus-factory
59-
dde-dock
6063
qtbase
6164
qtmultimedia
6265
qtx11extras
@@ -78,9 +81,6 @@ stdenv.mkDerivation rec {
7881
gst-plugins-good
7982
]);
8083

81-
# Fix build failure on dtk 5.6.20
82-
env.NIX_CFLAGS_COMPILE = "-std=c++14";
83-
8484
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
8585
qtWrapperArgs = [
8686
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
@@ -91,11 +91,11 @@ stdenv.mkDerivation rec {
9191
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
9292
'';
9393

94-
meta = with lib; {
94+
meta = {
9595
description = "Screen recorder application for dde";
9696
homepage = "https://github.com/linuxdeepin/deepin-screen-recorder";
97-
license = licenses.gpl3Plus;
98-
platforms = platforms.linux;
99-
maintainers = teams.deepin.members;
97+
license = lib.licenses.gpl3Plus;
98+
platforms = lib.platforms.linux;
99+
maintainers = lib.teams.deepin.members;
100100
};
101101
}

0 commit comments

Comments
 (0)