Unverified Commit 9999aa37 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #315531 from NixOS/backport-315021-to-release-24.05 

[Backport release-24.05] deepin.dde-daemon: do not create /usr/share/uadp
parents 4d899ff0 1e64ec0b

pkgs/desktops/deepin/go-package/dde-daemon/default.nix

+11 −8
Original line number Diff line number Diff line
@@ -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