BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #272406 from wineee/dtk

Browse source 
deepin desktop environment: Minor update
This commit is contained in:
Sandro 2024-03-11 00:20:11 +01:00 committed by GitHub
commit 03b073b10c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 146 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff Normal file
View file

@ -0,0 +1,20 @@
diff --git a/src/source/common/ddesktopservicesthread.h b/src/source/common/ddesktopservicesthread.h
index 49313744..456a5e96 100644
--- a/src/source/common/ddesktopservicesthread.h
+++ b/src/source/common/ddesktopservicesthread.h
@@ -8,10 +8,14 @@
#include <QThread>
+#include <dtkwidget_global.h>
+#include <dtkgui_global.h>
#include <DDesktopServices>
#include <QDebug>
#include <QFileInfo>
+
DWIDGET_USE_NAMESPACE
+DGUI_USE_NAMESPACE
// 文管打开文件目录线程
class DDesktopServicesThread : public QThread

17
pkgs/desktops/deepin/apps/deepin-compressor/default.nix
View file

@ -20,20 +20,24 @@
stdenv.mkDerivation rec {
pname = "deepin-compressor";
version = "5.12.23";
version = "5.12.24";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-8qfpNM2rci4subdodxfJZLP3OvAxXl7QRl4MHGr15nA=";
hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k=";
};
patches = [
./0001-fix-build-on-new-dtk.diff
];
postPatch = ''
substituteInPlace src/source/common/pluginmanager.cpp \
--replace "/usr/lib/" "$out/lib/"
--replace-fail "/usr/lib/" "$out/lib/"
substituteInPlace src/desktop/deepin-compressor.desktop \
--replace "/usr" "$out"
--replace-fail "/usr" "$out"
'';
nativeBuildInputs = [
@ -61,6 +65,11 @@ stdenv.mkDerivation rec {
"-DUSE_TEST=OFF"
];
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
];
strictDeps = true;
meta = with lib; {

3
pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
View file

@ -78,6 +78,9 @@ stdenv.mkDerivation rec {
gst-plugins-good
]);
# Fix build failure on dtk 5.6.20
env.NIX_CFLAGS_COMPILE = "-std=c++14";
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"

4
pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
View file

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "deepin-system-monitor";
version = "6.0.9";
version = "6.0.13";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-ompsCTPmmF7S0UHNNU0YDQiTdvcFglpEoS4o+XMZ7jg=";
hash = "sha256-QwZPvEOYypSmbe3deqLRsI3VL/CgVc+Ql3JlsMZ9MqY=";
};
postPatch = ''

4
pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
View file

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation rec {
pname = "dde-account-faces";
version = "1.0.15";
version = "1.0.16";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-/eTGy+9fcYmGrh09RdCIZ2Cn12gTaGtg4Tluv25n5r0=";
hash = "sha256-PtbEsFQl6M5Ouadxy9CTVh1Bmmect83NODO4Ks+ckKU=";
};
makeFlags = [ "PREFIX=${placeholder "out"}/var" ];

4
pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
View file

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "deepin-icon-theme";
version = "2023.11.28";
version = "2024.01.31";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-kCWJAmJa0VmhnuegE+acj82Ojl4Z5D8g7/q2PzppJwg=";
hash = "sha256-08maujG5Tibsv9N+5olOeD8MrXTRiZh0OQm0bg8t+Cc=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];

4
pkgs/desktops/deepin/core/dde-app-services/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "dde-app-services";
version = "1.0.23";
version = "1.0.25";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-INxbRDpG3MqPW6IMTqEagDCGo7vwxkR6D1+lcWdjO3w=";
hash = "sha256-/lHiSUOTD8nC0WDLAHAFzm1YC0WjSS5W5JNC0cjeVEo=";
};
postPatch = ''

6
pkgs/desktops/deepin/core/dde-appearance/default.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "dde-appearance";
version = "1.1.6";
version = "1.1.25";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-7oRbydLXw8yRzi9L1GH/q0cjMY/DLyWbj4RUSyNpVNM=";
hash = "sha256-H9TvWF6Q0lX4GF4mQ71E3SUqWbhH7dzHIlScovbN7lM=";
};
patches = [
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/service/modules/api/themethumb.cpp \
--replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api"
substituteInPlace src/service/dbus/deepinwmfaker.cpp \
substituteInPlace fakewm/dbus/deepinwmfaker.cpp \
--replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
substituteInPlace src/service/modules/api/locale.cpp \

6
pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff
View file

@ -11,10 +11,10 @@ index b612e6e..371f966 100644
"serial": 0,
"flags": [],
"name": "Background_Uris",
diff --git a/src/service/dbus/deepinwmfaker.cpp b/src/service/dbus/deepinwmfaker.cpp
diff --git a/fakewm/dbus/deepinwmfaker.cpp b/fakewm/dbus/deepinwmfaker.cpp
index 5d455fa..40ec608 100644
--- a/src/service/dbus/deepinwmfaker.cpp
+++ b/src/service/dbus/deepinwmfaker.cpp
--- a/fakewm/dbus/deepinwmfaker.cpp
+++ b/fakewm/dbus/deepinwmfaker.cpp
@@ -54,13 +54,13 @@ Q_GLOBAL_STATIC_WITH_ARGS(QGSettings, _gsettings_dde_zone, ("com.deepin.dde.zone
#define KWinDBusCompositorInterface "org.kde.kwin.Compositing"

42
pkgs/desktops/deepin/core/dde-application-manager/default.nix
View file

@ -1,42 +1,36 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, wrapQtAppsHook
, qtbase
, dtkwidget
, dde-polkit-agent
, gsettings-qt
, libcap
, jemalloc
, xorg
, iconv
}:
stdenv.mkDerivation rec {
pname = "dde-application-manager";
version = "1.0.19";
version = "1.1.8";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-1P265xqlL/wML66nKdfTgkRx6MCpLwrt5rXu+CyeShU=";
hash = "sha256-ImyXSyQWMFLvmtx9mBxrr4/IFOgOH1BW650mbiwFh5U=";
};
# remove this patch after next release
postPatch = ''
substituteInPlace src/modules/mimeapp/mime_app.cpp src/modules/launcher/common.h src/service/main.cpp \
misc/dconf/com.deepin.dde.appearance.json \
--replace "/usr/share" "/run/current-system/sw/share"
substituteInPlace src/lib/dlocale.cpp --replace "/usr/share/locale/locale.alias" "${iconv}/share/locale/locale.alias"
for file in $(grep -rl "/usr/bin"); do
substituteInPlace $file --replace "/usr/bin/" "/run/current-system/sw/bin/"
done
'';
patches = [
(fetchpatch {
name = "set-more-scale-envs-to-application.patch";
url = "https://github.com/linuxdeepin/dde-application-manager/commit/a1f8ad276d88c81249dd3468779862186a180238.patch";
hash = "sha256-/iKg6NZZomNEKYsZCZP1IfNr7ZAXiA9RVBnyf+M/f4w=";
})
(fetchpatch {
name = "support-execSearchPath-to-prevent-systemd-from-finding-binaries.patch";
url = "https://github.com/linuxdeepin/dde-application-manager/commit/2eaca7c6b8b841d571e9d3510f9f14c321cd976e.patch";
hash = "sha256-GWUIv4NIBLQpnY4GcjLShMjiXAfPi3zKdol3whchC/Y=";
})
];
nativeBuildInputs = [
cmake
@ -46,12 +40,6 @@ stdenv.mkDerivation rec {
buildInputs = [
qtbase
dtkwidget
gsettings-qt
libcap
jemalloc
xorg.libXdmcp
xorg.libXres
];
meta = with lib; {

4
pkgs/desktops/deepin/core/dde-calendar/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "dde-calendar";
version = "5.11.1";
version = "5.12.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-EQcB+a0dK2c6NdvGFbyp65a8nN2PmOpZLWx61UDOTJg=";
hash = "sha256-p+KtObh2JT7aPcDCi0jmaNmLqB1aU3IvAiYrGmhErcI=";
};
patches = [

6
pkgs/desktops/deepin/core/dde-control-center/default.nix
View file

@ -17,19 +17,20 @@
, polkit-qt
, libxcrypt
, librsvg
, gtest
, runtimeShell
, dbus
}:
stdenv.mkDerivation rec {
pname = "dde-control-center";
version = "6.0.28";
version = "6.0.44";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-kgQ4ySiYtaklOqER56QtKD9lk1CnRSEAU4QPHycl9eI=";
hash = "sha256-NN2CSIYByxeTZraK48lAsQSJYAOTDHzKT1FOa+VWMo0=";
};
postPatch = ''
@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
polkit-qt
libxcrypt
librsvg
gtest
];
cmakeFlags = [

4
pkgs/desktops/deepin/core/dde-dock/default.nix
View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "dde-dock";
version = "6.0.22";
version = "6.0.35";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-fhc2faiPH35ZKw6SCoGTz+6mgxabNpCFQeY2p68Ba5w=";
hash = "sha256-ATC/Ze6GyjT92eCgAt9g2FIQbXLVHUMuXuAslNnbkCE=";
};
postPatch = ''

15
pkgs/desktops/deepin/core/dde-file-manager/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, runtimeShell
, dtkwidget
, qt5integration
@ -44,13 +43,13 @@
stdenv.mkDerivation rec {
pname = "dde-file-manager";
version = "6.0.31";
version = "6.0.40";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-mc2HcoLrwMXKU8w34KUEh62ZfEIfbJLVzz4JGnUE5EM=";
hash = "sha256-fvxP6wle4hezt9nEDpTgK+xB4J5XIC0mP5jWCmkjJPA=";
};
nativeBuildInputs = [
@ -63,13 +62,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true;
patches = [
./use_v23_dbus_interface.diff
(fetchpatch {
name = "use-pkgconfig-to-check-mount.patch";
url = "https://github.com/linuxdeepin/dde-file-manager/commit/b6c210057d991591df45b80607a614e7a57a9dc0.patch";
hash = "sha256-k0ZYlOVN3hHs1qvvRaJ3i6okOhDE+DoUKGs9AhSFBGU=";
})
./patch_check_v23_interface.diff
];
postPatch = ''
@ -132,6 +125,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DVERSION=${version}"
"-DNIX_DEEPIN_VERSION=23"
"-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
];
enableParallelBuilding = true;

6
pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff → pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff
View file

@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e93d3ad..94e3eca 100644
index 8a8cfb079..34092aa57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -31,7 +31,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
endif()
#Indentify the version
-if (${DEEPIN_OS_VERSION} MATCHES "23")
+if (TRUE)
+if (${NIX_DEEPIN_VERSION} MATCHES "23")
add_definitions(-DCOMPILE_ON_V23)
set(COMPLIE_ON_V23 TRUE)
message("COMPILE ON v23")

9
pkgs/desktops/deepin/core/dde-launchpad/default.nix
View file

@ -15,15 +15,20 @@
stdenv.mkDerivation rec {
pname = "dde-launchpad";
version = "0.3.0";
version = "0.4.4";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-8m0DjQYih3hB/n2VHuJgUYBe8tpGwBU0NdkLxr1OsFc=";
hash = "sha256-az8BC3n44NGpATNu3Exjn3H7Rumx/YqDXztEGqCpAbY=";
};
postPatch = ''
substituteInPlace desktopintegration.cpp \
--replace "AppStreamQt/pool.h" "AppStreamQt5/pool.h"
'';
nativeBuildInputs = [
cmake
qttools

4
pkgs/desktops/deepin/core/dde-network-core/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "dde-network-core";
version = "2.0.15";
version = "2.0.21";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-AMuWEz3Eyw0tG0srLWpqS7MO7Z4ZzIay4z59cZQZU0o=";
hash = "sha256-xuPEh0o62seyxlW+MKGgv/DdheYibSI1K0RJAjxraCw=";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/core/dde-session-shell/default.nix
View file

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "dde-session-shell";
version = "6.0.10";
version = "6.0.17";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-h4X3RZe7+CxVeFmk/7+7K4d/2D1+jhECKQaxl4TsuvM=";
hash = "sha256-X/aBMxrYeCT3I9ynV8cPzS23H44fHLkpkztewnfTNxA=";
};
postPatch = ''

4
pkgs/desktops/deepin/core/dde-session-ui/default.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "dde-session-ui";
version = "6.0.10";
version = "6.0.16";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-JwktVbwWdfqURhZuEFdB5oaKMsBZu5DekpZ2WGpcL4Q=";
hash = "sha256-hxunGK7DxRuAbmi6PtylHCBajV3b1qbFVA+AiuOCcN0=";
};
postPatch = ''

7
pkgs/desktops/deepin/core/dde-session/default.nix
View file

@ -15,16 +15,19 @@
stdenv.mkDerivation rec {
pname = "dde-session";
version = "1.1.9";
version = "1.2.5";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-CyHvvNALXe4fOMjD48By/iaU6/xNUhH9yG19Ob3bHy0=";
hash = "sha256-YYGRjVbVFyzmRhYu6sDtxzghocgM7Myr3K77AqWQk3E=";
};
postPatch = ''
substituteInPlace misc/CMakeLists.txt \
--replace "/etc" "$out/etc"
# Avoid using absolute path to distinguish applications
substituteInPlace src/dde-session/impl/sessionmanager.cpp \
--replace 'file.readAll().startsWith("/usr/bin/dde-lock")' 'file.readAll().contains("dde-lock")' \

4
pkgs/desktops/deepin/core/dde-widgets/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "dde-widgets";
version = "6.0.14";
version = "6.0.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-bmhT7UhMXtC5wlRtwlVnGjoq8rUQcDSk4rGQ0Xrz9ZI=";
hash = "sha256-oB0lyfmxBSwqjXO+etYdc+DghZVSBU+LXYqK1WS5DaU=";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/core/deepin-kwin/default.nix
View file

@ -36,13 +36,13 @@
stdenv.mkDerivation rec {
pname = "deepin-kwin";
version = "5.25.11";
version = "5.25.15";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-J92T1hsRmmtkjF9OPsrikRtd7bQSEG88UOYu+BHUSx0=";
hash = "sha256-aI5wHEFfvZeoz4ykw9dVx/9e96T1Yahs4YZNutv+CYM=";
};
patches = [

4
pkgs/desktops/deepin/default.nix
View file

@ -1,4 +1,4 @@
{ lib, pkgs, config, libsForQt5 }:
{ lib, pkgs, config, libsForQt5, qt6Packages }:
let
packages = self:
let
@ -28,7 +28,7 @@ let
deepin-kwin = callPackage ./core/deepin-kwin { };
dde-appearance = callPackage ./core/dde-appearance { };
dde-app-services = callPackage ./core/dde-app-services { };
dde-application-manager = callPackage ./core/dde-application-manager { };
dde-application-manager = qt6Packages.callPackage ./core/dde-application-manager { };
dde-control-center = callPackage ./core/dde-control-center { };
dde-calendar = callPackage ./core/dde-calendar { };
dde-clipboard = callPackage ./core/dde-clipboard { };

25
pkgs/desktops/deepin/go-package/dde-api/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, buildGoModule
, pkg-config
, deepin-gettext-tools
@ -21,40 +20,32 @@
buildGoModule rec {
pname = "dde-api";
version = "6.0.7";
version = "6.0.9";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-kdf1CoZUyda6bOTW0WJTgaXYhocrjRU9ptj7i+k8aaQ=";
hash = "sha256-ht5IaXi4nz0/U1zqp4JTiDkQ3NB69q24MgWfu45SpoY=";
};
patches = [
(fetchpatch {
name = "modify_PKGBUILD_to_support_OBS.patch";
url = "https://github.com/linuxdeepin/dde-api/commit/1399522d032c6c649db79a33348cdb1a233bc23a.patch";
hash = "sha256-kSHnYaOxIvv7lAJnvxpSwyRDPyDxpAq9x+gJcBdU3T8=";
})
];
vendorHash = "sha256-4Yscw3QjWG1rlju6sMRHGn3dSe65b1nx10B3KeyAzBM=";
vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q=";
postPatch = ''
substituteInPlace misc/systemd/system/deepin-shutdown-sound.service \
--replace "/usr/bin/true" "${coreutils}/bin/true"
--replace-fail "/usr/bin/true" "${coreutils}/bin/true"
substituteInPlace sound-theme-player/main.go \
--replace "/usr/sbin/alsactl" "alsactl"
--replace-fail "/usr/sbin/alsactl" "alsactl"
substituteInPlace misc/{scripts/deepin-boot-sound.sh,systemd/system/deepin-login-sound.service} \
--replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
--replace-fail "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \
--replace "/usr/share/dde-api" "$out/share/dde-api"
--replace-fail "/usr/share/dde-api" "$out/share/dde-api"
substituteInPlace themes/{theme.go,settings.go} \
--replace "/usr/share" "/run/current-system/sw/share"
--replace-fail "/usr/share" "/run/current-system/sw/share"
for file in $(grep "/usr/lib/deepin-api" * -nR |awk -F: '{print $1}')
do

7
pkgs/desktops/deepin/go-package/dde-daemon/default.nix
View file

@ -38,16 +38,16 @@
buildGoModule rec {
pname = "dde-daemon";
version = "6.0.22";
version = "6.0.34";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-D7s6wWZeZHYl/aP/0qLYNn+lZEwGJAjFNbO0whKymck=";
hash = "sha256-NIFgv6EUSnCqSdPttx6wrr7K1nRV/JIZJy9uS7uu0Sc=";
};
vendorHash = "sha256-U+G5CELpor34RgFzHpxfvJ/jBfWfE4ShjY2b2Z61BhE=";
vendorHash = "sha256-F39QGxY0aD+hHWguHosSrSzcB/ahYbnFW9vVtS5oUnU=";
patches = [
./0001-dont-set-PATH.diff
@ -73,6 +73,7 @@ buildGoModule rec {
--replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers"
substituteInPlace timedate1/zoneinfo/zone.go \
--replace "/usr/share/dde" "$out/share/dde" \
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
substituteInPlace accounts1/image_blur.go grub2/modify_manger.go \

4
pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "go-dbus-factory";
version = "1.10.23";
version = "2.0.8";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-6u9Bpoa80j/K1MipncfM378/qmSSMZAlx88jE4hHYBk=";
sha256 = "sha256-yzmr61wrBfZi+CuXFhtvOk7EaFtE8y3QyVwwgEDqwKY=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];

61
pkgs/desktops/deepin/go-package/startdde/0001-avoid-use-hardcode-path.patch
View file

@ -1,61 +0,0 @@
diff --git a/misc/auto_launch/chinese.json b/misc/auto_launch/chinese.json
index 14b8bff..2b2c412 100644
--- a/misc/auto_launch/chinese.json
+++ b/misc/auto_launch/chinese.json
@@ -3,7 +3,7 @@
"Priority": 9,
"Group": [
{
- "Command": "/usr/bin/dde-file-manager",
+ "Command": "dde-file-manager",
"Wait": false,
"Args": [
"-d"
@@ -25,7 +25,7 @@
"Priority": 7,
"Group": [
{
- "Command": "/usr/bin/dde-shutdown",
+ "Command": "dde-shutdown",
"Wait": false,
"Args": [
"-d"
diff --git a/session.go b/session.go
index da76626..bf9a2c4 100644
--- a/session.go
+++ b/session.go
@@ -14,6 +14,7 @@ import (
"sync"
"syscall"
"time"
+ "strings"
"github.com/adrg/xdg"
"github.com/godbus/dbus/v5"
@@ -85,7 +86,7 @@ type SessionManager struct {
}
const (
- cmdShutdown = "/usr/bin/dde-shutdown"
+ cmdShutdown = "dde-shutdown"
lockFrontDest = "org.deepin.dde.LockFront1"
lockFrontIfc = lockFrontDest
lockFrontObjPath = "/org/deepin/dde/LockFront1"
@@ -458,7 +459,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error {
return dbusutil.ToError(err)
}
- if exe == "/usr/bin/dde-lock" {
+ if strings.Contains(exe, "dde-lock") {
m.setLocked(value)
return nil
}
@@ -478,7 +479,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error {
return dbusutil.ToError(fmt.Errorf("desktop file %q is invalid", desktopFile))
}
exe = info.GetExecutable()
- if exe != "/usr/bin/dde-lock" {
+ if strings.Contains(exe, "dde-lock") {
return dbusutil.ToError(fmt.Errorf("exe %q of desktop file %q is invalid", exe, desktopFile))
}

14
pkgs/desktops/deepin/go-package/startdde/default.nix
View file

@ -19,29 +19,25 @@
buildGoModule rec {
pname = "startdde";
version = "6.0.10";
version = "6.0.13";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-B2B8QlA1Ps/ybVzionngtwDwTLd7H02RKJwcXymGlJM=";
hash = "sha256-sftPQq4cSyCTuvVtvjT8YJDLQOpSbmnXEVzFwFFaU4U=";
};
patches = [
./0001-avoid-use-hardcode-path.patch
];
vendorHash = "sha256-5BEOazAygYL1N+CaGAbUwdpHZ1EiHr6yNW27/bXNdZg=";
vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE=";
postPatch = ''
substituteInPlace display/manager.go session.go \
substituteInPlace display/manager.go \
--replace "/bin/bash" "${runtimeShell}"
substituteInPlace misc/systemd_task/dde-display-task-refresh-brightness.service \
--replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
substituteInPlace display/manager.go utils.go session.go \
substituteInPlace display/manager.go \
--replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
substituteInPlace misc/lightdm.conf --replace "/usr" "$out"

4
pkgs/desktops/deepin/library/dtkcommon/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "dtkcommon";
version = "5.6.17";
version = "5.6.21";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-mquBuF+Gzq5txxCczeS+gI8LshdKnK5WnpOCytNki+w=";
hash = "sha256-wRTzgvtmbGJJaIwi1f5m98K2o6g7yZdnKYR1nsDDwk8=";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/library/dtkcore/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "dtkcore";
version = "5.6.17";
version = "5.6.22";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-/MGSvT8tPn+KqqlM6FY2iFsArmAkYMW5Q3Sl4g4zvH0=";
hash = "sha256-W8uLNWC8bYzrKrX/hq9p1h66dWrxp4Vt+/27zDJeAS4=";
};
patches = [

4
pkgs/desktops/deepin/library/dtkdeclarative/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "dtkdeclarative";
version = "5.6.17";
version = "5.6.24";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-P0F6GidGp+CkNplKnLiaYVtcxs6N66gGIx6UcplEt08=";
hash = "sha256-bGy8e+JAyHiAwWvO5Xz1TubHUDP4i4nWUR4h5/appM0=";
};
patches = [

11
pkgs/desktops/deepin/library/dtkgui/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, pkg-config
, cmake
, qttools
@ -16,24 +15,18 @@
stdenv.mkDerivation rec {
pname = "dtkgui";
version = "5.6.17";
version = "5.6.22";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-ssCVMFCE1vhucYMxXkEZV5YlFxT1JdYGqrzILhWX1XI=";
hash = "sha256-h3DFG6FaJXP9o9u8R31MtX3Z1+P3DrNDT8Xbd8tlI4Y=";
};
patches = [
./fix-pkgconfig-path.patch
./fix-pri-path.patch
(fetchpatch {
name = "fix_svg_with_filter_attribute_rendering_exception.patch";
url = "https://github.com/linuxdeepin/dtkgui/commit/f2c9327eb4989ab8ea96af7560c67d1cada794de.patch";
hash = "sha256-lfg09tgS4vPuYachRbHdaMYKWdZZ0lP0Hxakkr9JKGs=";
})
];
nativeBuildInputs = [

4
pkgs/desktops/deepin/library/dtkwidget/default.nix
View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "dtkwidget";
version = "5.6.17";
version = "5.6.22";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-oFmM0e7ht3lCL50pwS/v/BLFmT2jymQaUZ4SmLdxvMo=";
hash = "sha256-szy1gPm+PsiUXGvo5QuXKYMVPCcaqVX47iu48WXOjWU=";
};
patches = [

4
pkgs/desktops/deepin/library/image-editor/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "image-editor";
version = "1.0.35";
version = "1.0.41";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-Xr4tueipQbRHyKLStTWeUcVbX7Baiz0YooaaVk65Y+U=";
hash = "sha256-9V9B0YSUTWv/4IbTRtKJSVrZx6j8jqJxIIR9TwUZ0U0=";
};
postPatch = ''

4
pkgs/desktops/deepin/library/qt5integration/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "qt5integration";
version = "5.6.17";
version = "5.6.20";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-8ag/cFkjp5u/0/71xKR6z6dXp2NGRIYNNbzzEmgsDmc=";
hash = "sha256-cmvscSIu3LOTKuMs/+JUdJAvQ7OB4o1k+LqfRxNefZU=";
};
nativeBuildInputs = [

13
pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, extra-cmake-modules
, pkg-config
@ -18,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "qt5platform-plugins";
version = "5.6.16";
version = "5.6.22";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-1/biT8wR44+sdOMhBW/8KMUSBDK/UxuEqsyjTZyjBT4=";
hash = "sha256-0XQ4s6xpFHoG6SC8RE8WVnbHH7qNeOYkhrYUkDEH8Dc=";
};
nativeBuildInputs = [
@ -45,14 +44,6 @@ stdenv.mkDerivation rec {
qtwayland
];
patches = [
(fetchpatch {
name = "use-ECM-to-help-dwayland-find-wayland.patch";
url = "https://github.com/linuxdeepin/qt5platform-plugins/commit/d7f6230716a0ff5ce34fc7d292ec0af5bbac30e4.patch";
hash = "sha256-RY2+QBR3OjUGBX4Y9oVvIRY90IH9rTOCg8dCddkB2WE=";
})
];
cmakeFlags = [
"-DINSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
"-DQT_XCB_PRIVATE_HEADERS=${qtbase.src}/src/plugins/platforms/xcb"

4
pkgs/desktops/deepin/library/util-dfm/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "util-dfm";
version = "1.2.16";
version = "1.2.21";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-o5ubfCpgAHJXqihGyapq7Dj9eQlw2q6VoER/e37tM6w=";
hash = "sha256-EqNca3heIUUV5joMskpriCY+7NwjUc/vmQwomDkru80=";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
View file

@ -5,13 +5,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "deepin-desktop-base";
version = "2023.09.05";
version = "2024.01.03";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-Gqp56TbkuTOI3aT7UmRuYBjUwRiOoIUHiRf0DaY0yew=";
hash = "sha256-45qR1LCnA8ZSrWykqNvvm7Dxbi5pQnAuFy6nZJrzyi0=";
};
makeFlags = [ "DESTDIR=${placeholder "out"}" ];