git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #59943 from romildo/fix.deepin.modules

nixos/deepin: use only one module for deepin services

commitb4941a463e5248b01a1a1eb981b35b3824832f97 authorJosé Romildo Malaquias <malaquias@gmail.com> dateSun 5 May 2019, 20:52 (8 years ago) parent40af53c78f1761
6 files changed+152−82
nixos/modules/module-list.nix+1−2 nixos/modules/services/desktops/deepin/dde-daemon.nix−41 nixos/modules/services/desktops/deepin/deepin-menu.nix−29 nixos/modules/services/desktops/deepin/deepin.nix+118 pkgs/desktops/deepin/dde-api/default.nix+19−7 pkgs/desktops/deepin/dde-daemon/default.nix+14−3
nixos/modules/module-list.nix+1−2
@@ -256,8 +256,7 @@
256256 ./services/databases/virtuoso.nix
257257 ./services/desktops/accountsservice.nix
258258 ./services/desktops/bamf.nix
259− ./services/desktops/deepin/dde-daemon.nix
260− ./services/desktops/deepin/deepin-menu.nix
259+ ./services/desktops/deepin/deepin.nix
261260 ./services/desktops/dleyna-renderer.nix
262261 ./services/desktops/dleyna-server.nix
263262 ./services/desktops/pantheon/contractor.nix
nixos/modules/services/desktops/deepin/dde-daemon.nixdeleted−41
@@ -1,41 +0,0 @@
1−# dde-daemon
2−
3−{ config, pkgs, lib, ... }:
4−
5−{
6−
7− ###### interface
8−
9− options = {
10−
11− services.deepin.dde-daemon = {
12−
13− enable = lib.mkEnableOption
14− "A daemon for handling Deepin Desktop Environment session settings";
15−
16− };
17−
18− };
19−
20−
21− ###### implementation
22−
23− config = lib.mkIf config.services.deepin.dde-daemon.enable {
24−
25− environment.systemPackages = [ pkgs.deepin.dde-daemon ];
26−
27− services.dbus.packages = [ pkgs.deepin.dde-daemon ];
28−
29− systemd.packages = [ pkgs.deepin.dde-daemon ];
30−
31− users.groups.dde-daemon = { };
32−
33− users.users.dde-daemon = {
34− description = "Deepin daemon user";
35− group = "dde-daemon";
36− isSystemUser = true;
37− };
38−
39− };
40−
41−}
nixos/modules/services/desktops/deepin/deepin-menu.nixdeleted−29
@@ -1,29 +0,0 @@
1−# deepin-menu
2−
3−{ config, pkgs, lib, ... }:
4−
5−{
6−
7− ###### interface
8−
9− options = {
10−
11− services.deepin.deepin-menu = {
12−
13− enable = lib.mkEnableOption
14− "DBus service for unified menus in Deepin Desktop Environment";
15−
16− };
17−
18− };
19−
20−
21− ###### implementation
22−
23− config = lib.mkIf config.services.deepin.deepin-menu.enable {
24−
25− services.dbus.packages = [ pkgs.deepin.deepin-menu ];
26−
27− };
28−
29−}
nixos/modules/services/desktops/deepin/deepin.nixnew file+118
@@ -0,0 +1,118 @@
1+# deepin
2+
3+{ config, pkgs, lib, ... }:
4+
5+{
6+
7+ ###### interface
8+
9+ options = {
10+
11+ services.deepin.core.enable = lib.mkEnableOption "
12+ Basic dbus and systemd services, groups and users needed by the
13+ Deepin Desktop Environment.
14+ ";
15+
16+ services.deepin.deepin-menu.enable = lib.mkEnableOption "
17+ DBus service for unified menus in Deepin Desktop Environment.
18+ ";
19+
20+ services.deepin.deepin-turbo.enable = lib.mkEnableOption "
21+ Turbo service for the Deepin Desktop Environment. It is a daemon
22+ that helps to launch applications faster.
23+ ";
24+
25+ };
26+
27+
28+ ###### implementation
29+
30+ config = lib.mkMerge [
31+
32+ (lib.mkIf config.services.deepin.core.enable {
33+ environment.systemPackages = [
34+ pkgs.deepin.dde-api
35+ pkgs.deepin.dde-calendar
36+ pkgs.deepin.dde-daemon
37+ pkgs.deepin.dde-dock
38+ pkgs.deepin.dde-session-ui
39+ pkgs.deepin.deepin-anything
40+ pkgs.deepin.deepin-image-viewer
41+ pkgs.deepin.deepin-screenshot
42+ ];
43+
44+ services.dbus.packages = [
45+ pkgs.deepin.dde-api
46+ pkgs.deepin.dde-calendar
47+ pkgs.deepin.dde-daemon
48+ pkgs.deepin.dde-dock
49+ pkgs.deepin.dde-session-ui
50+ pkgs.deepin.deepin-anything
51+ pkgs.deepin.deepin-image-viewer
52+ pkgs.deepin.deepin-screenshot
53+ ];
54+
55+ systemd.packages = [
56+ pkgs.deepin.dde-api
57+ pkgs.deepin.dde-daemon
58+ pkgs.deepin.deepin-anything
59+ ];
60+
61+ boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything ];
62+
63+ boot.kernelModules = [ "vfs_monitor" ];
64+
65+ users.groups.deepin-sound-player = { };
66+
67+ users.users.deepin-sound-player = {
68+ description = "Deepin sound player";
69+ group = "deepin-sound-player";
70+ isSystemUser = true;
71+ };
72+
73+ users.groups.deepin-daemon = { };
74+
75+ users.users.deepin-daemon = {
76+ description = "Deepin daemon user";
77+ group = "deepin-daemon";
78+ isSystemUser = true;
79+ };
80+
81+ users.groups.deepin_anything_server = { };
82+
83+ users.users.deepin_anything_server = {
84+ description = "Deepin Anything Server";
85+ group = "deepin_anything_server";
86+ isSystemUser = true;
87+ };
88+
89+ security.pam.services.deepin-auth-keyboard.text = ''
90+ # original at ${pkgs.deepin.dde-daemon}/etc/pam.d/deepin-auth-keyboard
91+ auth [success=2 default=ignore] pam_lsass.so
92+ auth [success=1 default=ignore] pam_unix.so nullok_secure try_first_pass
93+ auth requisite pam_deny.so
94+ auth required pam_permit.so
95+ '';
96+
97+ environment.etc = {
98+ "polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla".source = "${pkgs.deepin.dde-api}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla";
99+ "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla";
100+ "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla";
101+ };
102+
103+ services.deepin.deepin-menu.enable = true;
104+ services.deepin.deepin-turbo.enable = true;
105+ })
106+
107+ (lib.mkIf config.services.deepin.deepin-menu.enable {
108+ services.dbus.packages = [ pkgs.deepin.deepin-menu ];
109+ })
110+
111+ (lib.mkIf config.services.deepin.deepin-turbo.enable {
112+ environment.systemPackages = [ pkgs.deepin.deepin-turbo ];
113+ systemd.packages = [ pkgs.deepin.deepin-turbo ];
114+ })
115+
116+ ];
117+
118+}
pkgs/desktops/deepin/dde-api/default.nix+19−7
@@ -68,15 +68,10 @@ buildGoPackage rec {
6868 rfkill # run
6969 xcur2png # run
7070 #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?)
71− ];
71+ ];
7272
7373 postPatch = ''
74− searchHardCodedPaths # debugging
75−
76− sed -i -e "s|/var|$out/var|" Makefile
77−
78− # TODO: confirm where to install grub themes
79− sed -i -e "s|/boot/grub|$out/boot/grub|" Makefile
74+ searchHardCodedPaths # debugging
8075
8176 fixPath $out /usr/lib/deepin-api \
8277 lunar-calendar/main.go \
@@ -90,6 +85,19 @@ buildGoPackage rec {
9085 misc/systemd/system/deepin-shutdown-sound.service \
9186 theme_thumb/gtk/gtk.go \
9287 thumbnails/gtk/gtk.go
88+ fixPath $out /boot/grub Makefile # TODO: confirm where to install grub themes
89+ fixPath $out /var Makefile
90+
91+ # This package wants to install polkit local authority files into
92+ # /var/lib. Nix does not allow a package to install files into /var/lib
93+ # because it is outside of the Nix store and should contain applications
94+ # state information (persistent data modified by programs as they
95+ # run). Polkit looks for them in both /etc/polkit-1 and
96+ # /var/lib/polkit-1 (with /etc having priority over /var/lib). An
97+ # work around is to install them to $out/etc and simlnk them to
98+ # /etc in the deepin module.
99+
100+ sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile
93101 '';
94102
95103 buildPhase = ''
@@ -103,6 +111,10 @@ buildGoPackage rec {
103111 remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/*
104112 '';
105113
114+ postFixup = ''
115+ searchHardCodedPaths $out # debugging
116+ '';
117+
106118 passthru.updateScript = deepin.updateScript { inherit name; };
107119
108120 meta = with stdenv.lib; {
pkgs/desktops/deepin/dde-daemon/default.nix+14−3
@@ -66,7 +66,7 @@ buildGoPackage rec {
6666 ];
6767
6868 postPatch = ''
69− searchHardCodedPaths
69+ searchHardCodedPaths # debugging
7070 patchShebangs network/nm_generator/gen_nm_consts.py
7171
7272 fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go
@@ -78,12 +78,21 @@ buildGoPackage rec {
7878 fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go
7979
8080 sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
81− sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
8281 sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile
82+ sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
8383
8484 find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} +
8585
86− searchHardCodedPaths
86+ # This package wants to install polkit local authority files into
87+ # /var/lib. Nix does not allow a package to install files into /var/lib
88+ # because it is outside of the Nix store and should contain applications
89+ # state information (persistent data modified by programs as they
90+ # run). Polkit looks for them in both /etc/polkit-1 and
91+ # /var/lib/polkit-1 (with /etc having priority over /var/lib). An
92+ # work around is to install them to $out/etc and simlnk them to
93+ # /etc in the deepin module.
94+
95+ sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile
8796 '';
8897
8998 buildPhase = ''
@@ -104,6 +113,8 @@ buildGoPackage rec {
104113 for binary in $out/lib/deepin-daemon/*; do
105114 wrapProgram $binary "''${gappsWrapperArgs[@]}"
106115 done
116+
117+ searchHardCodedPaths $out # debugging
107118 '';
108119
109120 passthru.updateScript = deepin.updateScript { inherit name; };