From 30f81a77906091fd72656ae0c516c5b1acdd1540 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 4 May 2024 17:10:05 +0200 Subject: ludusavi: refactor, fix runtime error --- pkgs/applications/backup/ludusavi/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/backup/ludusavi') diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index af12d4973be45..29e0950775cba 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -12,7 +12,9 @@ , libXcursor , libXrandr , libXi +, libxkbcommon , vulkan-loader +, wayland , gnome , libsForQt5 }: @@ -23,7 +25,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "mtkennerly"; - repo = pname; + repo = "ludusavi"; rev = "v${version}"; hash = "sha256-3Z/v3+3mrmPV2Rb/5tM+h6UN+MEIF/aK07B93Zn38AA="; }; @@ -49,12 +51,12 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/com.github.mtkennerly.ludusavi.metainfo.xml -t \ "$out/share/metainfo/" install -Dm644 assets/icon.png \ - "$out/share/icons/hicolor/64x64/apps/${pname}.png" + "$out/share/icons/hicolor/64x64/apps/ludusavi.png" install -Dm644 assets/icon.svg \ - "$out/share/icons/hicolor/scalable/apps/${pname}.svg" - install -Dm644 "assets/${pname}.desktop" -t "$out/share/applications/" + "$out/share/icons/hicolor/scalable/apps/ludusavi.svg" + install -Dm644 "assets/ludusavi.desktop" -t "$out/share/applications/" install -Dm644 assets/MaterialIcons-Regular.ttf -t "$out/share/fonts/TTF/" - install -Dm644 LICENSE -t "$out/share/licenses/${pname}/" + install -Dm644 LICENSE -t "$out/share/licenses/ludusavi/" ''; postFixup = @@ -68,12 +70,14 @@ rustPlatform.buildRustPackage rec { libXcursor libXrandr libXi + libxkbcommon vulkan-loader + wayland ]; in '' - patchelf --set-rpath "${libPath}" "$out/bin/$pname" - wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} + patchelf --set-rpath "${libPath}" "$out/bin/ludusavi" + wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} ''; -- cgit 1.4.1