diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-06-27 18:10:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 18:10:44 -0400 |
| commit | cdeadfe2d715e3661a554b2b44b3b822c76ccc82 (patch) | |
| tree | 1993579b963c783a962989cf832dbb0d7ee8e38a /pkgs/desktops | |
| parent | 9a140a0989fac34bff568f393a79bb20d13de192 (diff) | |
| parent | aadbc98fe8a935e26f775520e9effce4e8f88ef6 (diff) | |
| download | nixlib-cdeadfe2d715e3661a554b2b44b3b822c76ccc82.tar nixlib-cdeadfe2d715e3661a554b2b44b3b822c76ccc82.tar.gz nixlib-cdeadfe2d715e3661a554b2b44b3b822c76ccc82.tar.bz2 nixlib-cdeadfe2d715e3661a554b2b44b3b822c76ccc82.tar.lz nixlib-cdeadfe2d715e3661a554b2b44b3b822c76ccc82.tar.xz nixlib-cdeadfe2d715e3661a554b2b44b3b822c76ccc82.tar.zst nixlib-cdeadfe2d715e3661a554b2b44b3b822c76ccc82.zip | |
Merge pull request #63796 from romildo/upd.deepin.dde-daemon
deepin.dde-daemon: 3.27.2.5 -> 3.27.2.6; fix some hard coded paths
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/deepin/dde-daemon/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index 63fed89e1c6f..4fb0272a3cef 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -4,12 +4,12 @@ deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3, libgudev, libinput, libnl, librsvg, linux-pam, networkmanager, pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go, - deepin, makeWrapper, wrapGAppsHook }: + deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-daemon"; - version = "3.27.2.5"; + version = "3.27.2.6"; goPackagePath = "pkg.deepin.io/dde/daemon"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "117yhsb0axwblncyj02fhcyl4b7jl7vvh1bbx08bscih5lnvjihx"; + sha256 = "14g138h23f1lh1y98pdrfhnph1m7pw8lq8ypiwv9qf3fmdyn35d4"; }; patches = [ @@ -63,6 +63,7 @@ buildGoPackage rec { librsvg pulseaudio tzdata + xkeyboard_config ]; postPatch = '' @@ -70,12 +71,16 @@ buildGoPackage rec { 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-daemon launcher/manager.go gesture/config.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 + 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}/lib|{DESTDIR}$out/lib|" Makefile |