-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
deepin.dde-control-center: init at 5.6.3
- Loading branch information
Showing
3 changed files
with
170 additions
and
0 deletions.
There are no files selected for viewing
140 changes: 140 additions & 0 deletions
140
pkgs/desktops/deepin/core/dde-control-center/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
{ stdenv | ||
, lib | ||
, fetchFromGitHub | ||
, fetchpatch | ||
, dtkwidget | ||
, qt5integration | ||
, qt5platform-plugins | ||
, dde-qt-dbus-factory | ||
, deepin-pw-check | ||
, udisks2-qt5 | ||
, cmake | ||
, qttools | ||
, qtbase | ||
, pkg-config | ||
, qtx11extras | ||
, qtmultimedia | ||
, wrapQtAppsHook | ||
, wrapGAppsHook | ||
, gsettings-qt | ||
, wayland | ||
, kwayland | ||
, qtwayland | ||
, polkit-qt | ||
, pcre | ||
, xorg | ||
, libselinux | ||
, libsepol | ||
, libxcrypt | ||
, librsvg | ||
, networkmanager-qt | ||
, glib | ||
, runtimeShell | ||
, tzdata | ||
, dbus | ||
, gtest | ||
}: | ||
|
||
stdenv.mkDerivation rec { | ||
pname = "dde-control-center"; | ||
version = "5.6.3"; | ||
|
||
src = fetchFromGitHub { | ||
owner = "linuxdeepin"; | ||
repo = pname; | ||
rev = version; | ||
sha256 = "sha256-/gzS+IbopIDRpufsa9cEfFBOqehPUnF4IozvwW8UEbY="; | ||
}; | ||
|
||
patches = [ | ||
# UserExperienceProgramLicenseAgreement comes from a non-open source component(deepin-deepinid-client) | ||
# If we don't block it, only an empty page will be displayed here | ||
# Remove this patch when dde-control-center is upgraded to 6.0.0 | ||
./dont-show-endUserLicenseAgreement-for-deepinos.patch | ||
]; | ||
|
||
postPatch = '' | ||
substituteInPlace src/frame/window/{mainwindow.cpp,insertplugin.cpp} com.deepin.controlcenter.develop.policy \ | ||
--replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" | ||
substituteInPlace src/frame/modules/datetime/timezone_dialog/timezone.cpp \ | ||
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" | ||
substituteInPlace src/frame/modules/accounts/accountsworker.cpp \ | ||
--replace "/bin/bash" "${runtimeShell}" | ||
substituteInPlace dde-control-center-autostart.desktop \ | ||
--replace "/usr" "$out" | ||
substituteInPlace com.deepin.dde.ControlCenter.service \ | ||
--replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \ | ||
--replace "/usr/share" "$out/share" | ||
substituteInPlace include/widgets/utils.h src/{reboot-reminder-dialog/main.cpp,frame/main.cpp,reset-password-dialog/main.cpp} \ | ||
--replace "/usr/share/dde-control-center" "$out/share/dde-control-center" | ||
substituteInPlace dde-control-center-wapper \ | ||
--replace "qdbus" "${qttools.bin}/bin/qdbus" \ | ||
--replace "/usr/share" "$out/share" | ||
''; | ||
|
||
nativeBuildInputs = [ | ||
cmake | ||
qttools | ||
pkg-config | ||
wrapQtAppsHook | ||
wrapGAppsHook | ||
]; | ||
dontWrapGApps = true; | ||
|
||
buildInputs = [ | ||
dtkwidget | ||
qt5platform-plugins | ||
dde-qt-dbus-factory | ||
deepin-pw-check | ||
qtbase | ||
qtx11extras | ||
qtmultimedia | ||
gsettings-qt | ||
udisks2-qt5 | ||
wayland | ||
kwayland | ||
qtwayland | ||
polkit-qt | ||
pcre | ||
xorg.libXdmcp | ||
libselinux | ||
libsepol | ||
libxcrypt | ||
librsvg | ||
networkmanager-qt | ||
gtest | ||
]; | ||
|
||
cmakeFlags = [ | ||
"-DCVERSION=${version}" | ||
"-DDISABLE_AUTHENTICATION=YES" | ||
"-DDISABLE_ACTIVATOR=YES" | ||
"-DDISABLE_SYS_UPDATE=YES" | ||
"-DDISABLE_RECOVERY=YES" | ||
]; | ||
|
||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH | ||
qtWrapperArgs = [ | ||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" | ||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}" | ||
]; | ||
|
||
preFixup = '' | ||
glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} | ||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}") | ||
''; | ||
|
||
meta = with lib; { | ||
description = "Control panel of Deepin Desktop Environment"; | ||
homepage = "https://github.com/linuxdeepin/dde-control-center"; | ||
license = licenses.gpl3Plus; | ||
platforms = platforms.linux; | ||
maintainers = teams.deepin.members; | ||
}; | ||
} |
29 changes: 29 additions & 0 deletions
29
...ktops/deepin/core/dde-control-center/dont-show-endUserLicenseAgreement-for-deepinos.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
From adcc5eb58e2dcd06810a40c237bc7984c2c5af4b Mon Sep 17 00:00:00 2001 | ||
From: rewine <luhongxu@deepin.org> | ||
Date: Sun, 8 Jan 2023 13:46:17 +0800 | ||
Subject: [PATCH] dont show endUserLicenseAgreement for deepinos | ||
|
||
--- | ||
src/frame/window/modules/systeminfo/systeminfowidget.cpp | 6 ++++++ | ||
1 file changed, 6 insertions(+) | ||
|
||
diff --git a/src/frame/window/modules/systeminfo/systeminfowidget.cpp b/src/frame/window/modules/systeminfo/systeminfowidget.cpp | ||
index 8e62604fb..0f443ee20 100644 | ||
--- a/src/frame/window/modules/systeminfo/systeminfowidget.cpp | ||
+++ b/src/frame/window/modules/systeminfo/systeminfowidget.cpp | ||
@@ -78,6 +78,12 @@ void SystemInfoWidget::initData() | ||
m_listView->setRowHidden(i, true); | ||
} | ||
} | ||
+ | ||
+ if (IsNotDeepinUos) { | ||
+ if (m.gsettingsName == "endUserLicenseAgreement") { | ||
+ m_listView->setRowHidden(i, true); | ||
+ } | ||
+ } | ||
} | ||
|
||
if (InsertPlugin::instance()->updatePluginInfo("systeminfo")) | ||
-- | ||
2.38.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters