MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 01:16:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #63796 from romildo/upd.deepin.dde-daemon

Browse source 
deepin.dde-daemon: 3.27.2.5 -> 3.27.2.6; fix some hard coded paths
This commit is contained in:
worldofpeace 2019-06-27 18:10:44 -04:00 committed by GitHub
commit cdeadfe2d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/desktops/deepin/dde-daemon/default.nix
View file

@ -4,12 +4,12 @@
deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3, deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3,
libgudev, libinput, libnl, librsvg, linux-pam, networkmanager, libgudev, libinput, libnl, librsvg, linux-pam, networkmanager,
pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go, pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go,
deepin, makeWrapper, wrapGAppsHook }: deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }:
buildGoPackage rec { buildGoPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-daemon"; pname = "dde-daemon";
version = "3.27.2.5"; version = "3.27.2.6";
goPackagePath = "pkg.deepin.io/dde/daemon"; goPackagePath = "pkg.deepin.io/dde/daemon";
@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "117yhsb0axwblncyj02fhcyl4b7jl7vvh1bbx08bscih5lnvjihx"; sha256 = "14g138h23f1lh1y98pdrfhnph1m7pw8lq8ypiwv9qf3fmdyn35d4";
}; };
patches = [ patches = [
@ -63,6 +63,7 @@ buildGoPackage rec {
librsvg librsvg
pulseaudio pulseaudio
tzdata tzdata
xkeyboard_config
]; ];
postPatch = '' postPatch = ''
@ -70,12 +71,16 @@ buildGoPackage rec {
patchShebangs network/nm_generator/gen_nm_consts.py patchShebangs network/nm_generator/gen_nm_consts.py
fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go
fixPath $out /usr/share/dde-daemon launcher/manager.go gesture/config.go
fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile 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 ${glibc.bin} /usr/bin/getconf systeminfo/utils.go
fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go
fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.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 ${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 fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go
fixPath ${xkeyboard_config} /usr/share/X11/xkb inputdevices/layout_list.go
# TODO: deepin-system-monitor comes from dde-extra
sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile