diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2019-06-23 22:40:01 -0300 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2019-06-25 23:09:58 -0300 |
| commit | aadbc98fe8a935e26f775520e9effce4e8f88ef6 (patch) | |
| tree | 7b2c5dc7e6a3c65abf757dc618905fbcb2c7c3e7 /pkgs/desktops/deepin/dde-daemon | |
| parent | 45108a48b3f8faac8590bdb50bd229c746c4e2d6 (diff) | |
| download | nixlib-aadbc98fe8a935e26f775520e9effce4e8f88ef6.tar nixlib-aadbc98fe8a935e26f775520e9effce4e8f88ef6.tar.gz nixlib-aadbc98fe8a935e26f775520e9effce4e8f88ef6.tar.bz2 nixlib-aadbc98fe8a935e26f775520e9effce4e8f88ef6.tar.lz nixlib-aadbc98fe8a935e26f775520e9effce4e8f88ef6.tar.xz nixlib-aadbc98fe8a935e26f775520e9effce4e8f88ef6.tar.zst nixlib-aadbc98fe8a935e26f775520e9effce4e8f88ef6.zip | |
deepin.dde-daemon: fix some hard coded paths
Diffstat (limited to 'pkgs/desktops/deepin/dde-daemon')
| -rw-r--r-- | pkgs/desktops/deepin/dde-daemon/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index 5d8171b85cec..4fb0272a3cef 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -4,7 +4,7 @@ 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}"; @@ -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 |