tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

deepin.dde-calendar: 5.8.30 -> 5.10.1

rewine a58db6d3 356c6dcd

+35 -37
unified split
+22 -37
pkgs/desktops/deepin/core/dde-calendar/default.nix
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 - , fetchpatch 5 , dtkwidget 6 , qt5integration 7 , qt5platform-plugins 8 , dde-qt-dbus-factory 9 - , cmake 10 - , qttools 11 - , pkg-config 12 - , wrapQtAppsHook 13 , runtimeShell 14 - , qtbase 15 - , gtest 16 }: 17 18 stdenv.mkDerivation rec { 19 pname = "dde-calendar"; 20 - version = "5.8.30"; 21 22 src = fetchFromGitHub { 23 owner = "linuxdeepin"; 24 repo = pname; 25 rev = version; 26 - sha256 = "sha256-8/UXq9W3Gb1Lg/nOji6zcHJts6lgY2uDxvrBxQs3Zio="; 27 }; 28 29 patches = [ 30 - (fetchpatch { 31 - name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; 32 - url = "https://github.com/linuxdeepin/dde-calendar/commit/b9d9555d90a36318eeee62ece49250b4bf8acd10.patch"; 33 - sha256 = "sha256-pvgxZPczs/lkwNjysNuVu+1AY69VZlxOn7hR9A02/3M="; 34 - }) 35 ]; 36 37 postPatch = '' 38 - substituteInPlace calendar-service/src/dbmanager/huanglidatabase.cpp \ 39 - --replace "/usr/share/dde-calendar/data/huangli.db" "$out/share/dde-calendar/data/huangli.db" 40 - substituteInPlace calendar-service/src/main.cpp \ 41 - --replace "/usr/share/dde-calendar/translations" "$out/share/dde-calendar/translations" 42 - substituteInPlace calendar-service/assets/data/com.deepin.dataserver.Calendar.service \ 43 - --replace "/usr/lib/deepin-daemon/dde-calendar-service" "$out/lib/deepin-daemon/dde-calendar-service" 44 - substituteInPlace calendar-client/assets/dbus/com.deepin.Calendar.service \ 45 - --replace "/usr/bin/dde-calendar" "$out/bin/dde-calendar" 46 - substituteInPlace calendar-service/{src/{csystemdtimercontrol.cpp,jobremindmanager.cpp},assets/{data/com.dde.calendarserver.calendar.service,dde-calendar-service.desktop}} \ 47 - --replace "/bin/bash" "${runtimeShell}" 48 - 49 - substituteInPlace CMakeLists.txt \ 50 - --replace "ADD_SUBDIRECTORY(tests)" " " 51 ''; 52 53 nativeBuildInputs = [ ··· 58 ]; 59 60 buildInputs = [ 61 dtkwidget 62 - qt5platform-plugins 63 dde-qt-dbus-factory 64 - gtest 65 ]; 66 67 cmakeFlags = [ "-DVERSION=${version}" ]; 68 69 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 70 - qtWrapperArgs = [ 71 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 72 - ]; 73 - 74 - postFixup = '' 75 - wrapQtApp $out/lib/deepin-daemon/dde-calendar-service 76 - ''; 77 78 meta = with lib; { 79 description = "Calendar for Deepin Desktop Environment"; ··· 83 maintainers = teams.deepin.members; 84 }; 85 }
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 + , cmake 5 + , qttools 6 + , pkg-config 7 + , wrapQtAppsHook 8 , dtkwidget 9 , qt5integration 10 , qt5platform-plugins 11 , dde-qt-dbus-factory 12 + , qtbase 13 + , qtsvg 14 + , libical 15 + , sqlite 16 , runtimeShell 17 }: 18 19 stdenv.mkDerivation rec { 20 pname = "dde-calendar"; 21 + version = "5.10.1"; 22 23 src = fetchFromGitHub { 24 owner = "linuxdeepin"; 25 repo = pname; 26 rev = version; 27 + hash = "sha256-oPrtPOCLZof4BysWfsCYeoqbJf30r7LijGEEXZlsAAY="; 28 }; 29 30 patches = [ 31 + ./fix-wrapped-name-not-in-whitelist.diff 32 ]; 33 34 postPatch = '' 35 + for file in $(grep -rl "/bin/bash"); do 36 + substituteInPlace $file --replace "/bin/bash" "${runtimeShell}" 37 + done 38 ''; 39 40 nativeBuildInputs = [ ··· 45 ]; 46 47 buildInputs = [ 48 + qt5integration 49 + qt5platform-plugins 50 dtkwidget 51 + qtbase 52 + qtsvg 53 dde-qt-dbus-factory 54 + libical 55 + sqlite 56 ]; 57 58 cmakeFlags = [ "-DVERSION=${version}" ]; 59 60 + strictDeps = true; 61 62 meta = with lib; { 63 description = "Calendar for Deepin Desktop Environment"; ··· 67 maintainers = teams.deepin.members; 68 }; 69 } 70 +
+13
pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff
···
··· 1 + diff --git a/calendar-service/src/dbusservice/dservicebase.cpp b/calendar-service/src/dbusservice/dservicebase.cpp 2 + index ac182881..93a9c2d8 100644 3 + --- a/calendar-service/src/dbusservice/dservicebase.cpp 4 + +++ b/calendar-service/src/dbusservice/dservicebase.cpp 5 + @@ -52,6 +52,8 @@ bool DServiceBase::clientWhite(const int index) 6 + return true; 7 + } 8 + } 9 + + if (getClientName().contains("dde-calendar")) 10 + + return true; 11 + return false; 12 + #else 13 + Q_UNUSED(index)