From c5b448043578bfd4541865616eee2869ba418ddc Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 26 Sep 2023 17:09:25 +0800 Subject: [PATCH] dde-session: init at 1.1.9 --- .../deepin/core/dde-session/default.nix | 69 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-session/default.nix diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix new file mode 100644 index 000000000000..72ae99f8c843 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-session/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, qtbase +, dtkcore +, gsettings-qt +, libsecret +, xorg +, systemd +, dde-polkit-agent +}: + +stdenv.mkDerivation rec { + pname = "dde-session"; + version = "1.1.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-CyHvvNALXe4fOMjD48By/iaU6/xNUhH9yG19Ob3bHy0="; + }; + + postPatch = '' + # 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")' \ + + substituteInPlace systemd/dde-session-initialized.target.wants/dde-polkit-agent.service \ + --replace "/usr/lib/polkit-1-dde" "${dde-polkit-agent}/lib/polkit-1-dde" + + for file in $(grep -rl "/usr/lib/deepin-daemon"); do + substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + done + + for file in $(grep -rl "/usr/bin"); do + substituteInPlace $file --replace "/usr/bin/" "/run/current-system/sw/bin/" + done + ''; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + dtkcore + gsettings-qt + libsecret + xorg.libXcursor + systemd + ]; + + # FIXME: dde-wayland always exits abnormally + passthru.providedSessions = [ "dde-x11" ]; + + meta = with lib; { + description = "New deepin session based on systemd and existing projects"; + homepage = "https://github.com/linuxdeepin/dde-session"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index a2108c89b843..d9eef406f7a3 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -34,6 +34,7 @@ let dde-launcher = callPackage ./core/dde-launcher { }; dde-launchpad = callPackage ./core/dde-launchpad { }; dde-network-core = callPackage ./core/dde-network-core { }; + dde-session = callPackage ./core/dde-session { }; dde-session-shell = callPackage ./core/dde-session-shell { }; dde-session-ui = callPackage ./core/dde-session-ui { }; deepin-service-manager = callPackage ./core/deepin-service-manager { };