diff options
author | rewine <luhongxu@deepin.org> | 2024-05-27 14:41:06 +0800 |
---|---|---|
committer | rewine <luhongxu@deepin.org> | 2024-05-27 18:01:43 +0800 |
commit | 8fbe3b5589abd42111e1fdeb42e78faf6b36e6db (patch) | |
tree | 2f9b0c6331ff55f2c3df631b45d273a012bfdbdd /pkgs/desktops | |
parent | dfd9a2a7cdba403a216ff4e13425bb37339eedf8 (diff) |
deepin.dde-daemon: do not create /usr/share/uadp
fix: https://github.com/NixOS/nixpkgs/issues/314108
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/deepin/go-package/dde-daemon/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index 4a63b779c4c5d..14fe7c03c3e38 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -64,23 +64,26 @@ buildGoModule rec { postPatch = '' substituteInPlace session/eventlog/{app_event.go,login_event.go} \ - --replace "/bin/bash" "${runtimeShell}" + --replace-fail "/bin/bash" "${runtimeShell}" substituteInPlace inputdevices/layout_list.go \ - --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" + --replace-fail "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" - substituteInPlace bin/dde-system-daemon/wallpaper.go accounts1/user.go \ - --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" + substituteInPlace accounts1/user.go \ + --replace-fail "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" substituteInPlace timedate1/zoneinfo/zone.go \ - --replace "/usr/share/dde" "$out/share/dde" \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + --replace-fail "/usr/share/dde" "$out/share/dde" \ + --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" substituteInPlace accounts1/image_blur.go grub2/modify_manger.go \ - --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" + --replace-fail "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" substituteInPlace accounts1/user_chpwd_union_id.go \ - --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" + --replace-fail "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" + + substituteInPlace system/uadp1/crypto.go \ + --replace-fail "/usr/share/uadp" "/var/lib/dde-daemon/uadp" for file in $(grep "/usr/lib/deepin-daemon" * -nR |awk -F: '{print $1}') do |