diff --git a/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff b/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff new file mode 100644 index 000000000000..872fa26c5e55 --- /dev/null +++ b/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff @@ -0,0 +1,15 @@ +diff --git a/src/effects/multitaskview/multitaskview.cpp b/src/effects/multitaskview/multitaskview.cpp +index 268bc42..d41f7bf 100644 +--- a/src/effects/multitaskview/multitaskview.cpp ++++ b/src/effects/multitaskview/multitaskview.cpp +@@ -50,8 +50,8 @@ + #define SCISSOR_HOFFD 400 + + const char screen_recorder[] = "deepin-screen-recorder deepin-screen-recorder"; +-const char fallback_background_name[] = "file:///usr/share/wallpapers/deepin/desktop.jpg"; +-const char previous_default_background_name[] = "file:///usr/share/backgrounds/default_background.jpg"; ++const char fallback_background_name[] = "file:///run/current-system/sw/share/wallpapers/deepin/desktop.jpg"; ++const char previous_default_background_name[] = "file:///run/current-system/sw/share/backgrounds/default_background.jpg"; + const char add_workspace_png[] = ":/effects/multitaskview/buttons/add-light.png";//":/resources/themes/add-light.svg"; + const char delete_workspace_png[] = ":/effects/multitaskview/buttons/workspace_delete.png"; + diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix index 456f20b51906..03e40357317c 100644 --- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix +++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix @@ -36,23 +36,19 @@ stdenv.mkDerivation rec { pname = "deepin-kwin"; - version = "5.24.3-deepin.1.9"; - - /* - There are no buildable tag in github: - - 5.15 tag in eagel branch is used for UOS, it's too old to compile. - - 5.25 tag in master branch only work on unreleased deepin v23. - Since deepin-kwin was not maintained on github before, we lost all - tags in master branch, this version is read from debian/changelog - */ + version = "5.25.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; - rev = "98c9085670938937e2a1ce964f6acddc5c1d6eb5"; - sha256 = "sha256-/hgDuaDrpwAQsMIoaS8pGBJwWfJSrq6Yjic3a60ITtM="; + rev = version; + hash = "sha256-J92T1hsRmmtkjF9OPsrikRtd7bQSEG88UOYu+BHUSx0="; }; + patches = [ + ./0001-hardcode-fallback-background.diff + ]; + # Avoid using absolute path to distinguish applications postPatch = '' substituteInPlace src/effects/screenshot/screenshotdbusinterface1.cpp \ @@ -102,6 +98,7 @@ stdenv.mkDerivation rec { xorg.libXcursor xorg.xcbutilcursor xorg.libXtst + xorg.libXScrnSaver ]; cmakeFlags = [