@@ -1,13 +1,15 @@
11{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig,
22 dbus-factory, go-dbus-factory, go-gir-generator, go-lib,
3− deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl,
4− librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3,
5− python3Packages, hicolor-icon-theme, go, deepin }:
3+ deepin-gettext-tools, dde-api, deepin-desktop-schemas,
4+ deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3,
5+ libgudev, libinput, libnl, librsvg, linux-pam, networkmanager,
6+ pulseaudio, xorg, python3, hicolor-icon-theme, glibc, tzdata, go,
7+ deepin, makeWrapper, wrapGAppsHook }:
68
79buildGoPackage rec {
810 name = "${pname}-${version}";
911 pname = "dde-daemon";
10− version = "3.6.0";
12+ version = "3.24.1";
1113
1214 goPackagePath = "pkg.deepin.io/dde/daemon";
1315
@@ -15,15 +17,14 @@ buildGoPackage rec {
1517 owner = "linuxdeepin";
1618 repo = pname;
1719 rev = version;
18− sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj";
20+ sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y";
1921 };
2022
2123 patches = [
2224 # https://github.com/linuxdeepin/dde-daemon/issues/51
2325 (fetchpatch {
24− name = "dde-daemon_3.2.3.patch";
25− url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch;
26− sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg";
26+ url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch;
27+ sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh";
2728 })
2829 ];
2930
@@ -38,46 +39,70 @@ buildGoPackage rec {
3839 go-gir-generator
3940 go-lib
4041 deepin-gettext-tools
41− dde-api
4242 linux-pam
4343 networkmanager
4444 networkmanager.dev
45− python3Packages.python
45+ python3
46+ makeWrapper
47+ wrapGAppsHook
48+ deepin.setupHook
4649 ];
4750
4851 buildInputs = [
4952 alsaLib
53+ dde-api
54+ deepin-desktop-base
55+ deepin-desktop-schemas
56+ deepin-wallpapers
5057 glib
51− gnome3.libgudev
58+ libgudev
5259 gtk3
5360 hicolor-icon-theme
5461 libinput
5562 libnl
5663 librsvg
5764 pulseaudio
65+ tzdata
5866 ];
5967
6068 postPatch = ''
61− patchShebangs .
69+ searchHardCodedPaths
70+ patchShebangs network/nm_generator/gen_nm_consts.py
6271
63− sed -i network/nm_generator/Makefile -e 's,/usr/share/gir-1.0/NM-1.0.gir,${networkmanager.dev}/share/gir-1.0/NM-1.0.gir,'
72+ fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go
73+ fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile
74+ fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go
75+ fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go
76+ fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go
77+ fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go
78+ fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go
6479
6580 sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
6681 sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
6782 sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile
6883
6984 find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} +
85+
86+ searchHardCodedPaths
7087 '';
7188
7289 buildPhase = ''
73− make -C go/src/${goPackagePath}
7490 # compilation of the nm module is failing
7591 #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code
92+ make -C go/src/${goPackagePath}
7693 '';
7794
7895 installPhase = ''
7996 make install PREFIX="$out" -C go/src/${goPackagePath}
8097 remove-references-to -t ${go} $out/lib/deepin-daemon/*
98+ searchHardCodedPaths $out
99+ '';
100+
101+ postFixup = ''
102+ # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
103+ for binary in $out/lib/deepin-daemon/*; do
104+ wrapProgram $binary "''${gappsWrapperArgs[@]}"
105+ done
81106 '';
82107
83108 passthru.updateScript = deepin.updateScript { inherit name; };