diff options
Diffstat (limited to 'pkgs/desktops/deepin')
-rw-r--r-- | pkgs/desktops/deepin/core/dde-application-manager/default.nix | 42 | ||||
-rw-r--r-- | pkgs/desktops/deepin/default.nix | 4 |
2 files changed, 17 insertions, 29 deletions
diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index 0949bc6e49931..865352f924756 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -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; { diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 0361a13142cbe..2edf1359bee9f 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -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 { }; |