deepin.dde-daemon: 3.6.0 -> 3.24.1
This commit is contained in:
José Romildo Malaquias
parent
5c38dbd225
commit
8532ff49e1
@ -1,13 +1,15 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig,
|
||||
dbus-factory, go-dbus-factory, go-gir-generator, go-lib,
|
||||
deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl,
|
||||
librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3,
|
||||
python3Packages, hicolor-icon-theme, go, deepin }:
|
||||
deepin-gettext-tools, dde-api, deepin-desktop-schemas,
|
||||
deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3,
|
||||
libgudev, libinput, libnl, librsvg, linux-pam, networkmanager,
|
||||
pulseaudio, xorg, python3, hicolor-icon-theme, glibc, tzdata, go,
|
||||
deepin, makeWrapper, wrapGAppsHook }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-daemon";
|
||||
version = "3.6.0";
|
||||
version = "3.24.1";
|
||||
|
||||
goPackagePath = "pkg.deepin.io/dde/daemon";
|
||||
|
||||
@ -15,15 +17,14 @@ buildGoPackage rec {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj";
|
||||
sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/linuxdeepin/dde-daemon/issues/51
|
||||
(fetchpatch {
|
||||
name = "dde-daemon_3.2.3.patch";
|
||||
url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch;
|
||||
sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg";
|
||||
url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch;
|
||||
sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh";
|
||||
})
|
||||
];
|
||||
|
||||
@ -38,46 +39,70 @@ buildGoPackage rec {
|
||||
go-gir-generator
|
||||
go-lib
|
||||
deepin-gettext-tools
|
||||
dde-api
|
||||
linux-pam
|
||||
networkmanager
|
||||
networkmanager.dev
|
||||
python3Packages.python
|
||||
python3
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
deepin.setupHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsaLib
|
||||
dde-api
|
||||
deepin-desktop-base
|
||||
deepin-desktop-schemas
|
||||
deepin-wallpapers
|
||||
glib
|
||||
gnome3.libgudev
|
||||
libgudev
|
||||
gtk3
|
||||
hicolor-icon-theme
|
||||
libinput
|
||||
libnl
|
||||
librsvg
|
||||
pulseaudio
|
||||
tzdata
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
searchHardCodedPaths
|
||||
patchShebangs network/nm_generator/gen_nm_consts.py
|
||||
|
||||
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,'
|
||||
fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go
|
||||
fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile
|
||||
fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go
|
||||
fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go
|
||||
fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go
|
||||
fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go
|
||||
fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go
|
||||
|
||||
sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
|
||||
sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
|
||||
sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile
|
||||
|
||||
find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} +
|
||||
|
||||
searchHardCodedPaths
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
make -C go/src/${goPackagePath}
|
||||
# compilation of the nm module is failing
|
||||
#make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code
|
||||
make -C go/src/${goPackagePath}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
make install PREFIX="$out" -C go/src/${goPackagePath}
|
||||
remove-references-to -t ${go} $out/lib/deepin-daemon/*
|
||||
searchHardCodedPaths $out
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
|
||||
for binary in $out/lib/deepin-daemon/*; do
|
||||
wrapProgram $binary "''${gappsWrapperArgs[@]}"
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
26
pkgs/desktops/deepin/dde-daemon/deps.nix
generated
26
pkgs/desktops/deepin/dde-daemon/deps.nix
generated
@ -1,4 +1,4 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/alecthomas/template";
|
||||
@ -41,8 +41,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/linuxdeepin/go-x11-client";
|
||||
rev = "03541136501cab4910ad8852fe749ef8e18907ca";
|
||||
sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp";
|
||||
rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561";
|
||||
sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -50,8 +50,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/msteinert/pam";
|
||||
rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7";
|
||||
sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync";
|
||||
rev = "f29b9f28d6f9a1f6c4e6fd5db731999eb946574b";
|
||||
sha256 = "1v5z51mgyz2glm7v0mg60xs1as88wx6cqhys2khc5d3khkr8q0qp";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -68,8 +68,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/image";
|
||||
rev = "69cc3646b96e61de0b417f4815b86c36e65783ee";
|
||||
sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9";
|
||||
rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65";
|
||||
sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -77,8 +77,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
|
||||
sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
|
||||
rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f";
|
||||
sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -86,8 +86,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
|
||||
sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
|
||||
rev = "e3703dcdd614d2d7488fff034c75c551ea25da95";
|
||||
sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -104,8 +104,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/linuxdeepin/go-lib.git";
|
||||
rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7";
|
||||
sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv";
|
||||
rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83";
|
||||
sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user