From e48d21ab76b3329dd9ee4e702646c6f941617453 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Sun, 27 Nov 2022 08:44:08 +0000 Subject: [PATCH] rlaunch: fix build on aarch64-linux Fixes "error[E0308]: mismatched types; expected `u8`, found `i8`" on aarch64 --- pkgs/applications/misc/rlaunch/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/applications/misc/rlaunch/default.nix index 5622c94d427..9b00abd14cd 100644 --- a/pkgs/applications/misc/rlaunch/default.nix +++ b/pkgs/applications/misc/rlaunch/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , rustPlatform , xorg }: @@ -17,6 +18,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "00lnw48kn97gp45lylv5c6v6pil74flzpsq9k69xgvvjq9yqjzrx"; + patches = [ + # Fixes "error[E0308]: mismatched types; expected `u8`, found `i8`" on aarch64 + # Remove with next version update + (fetchpatch { + url = "https://github.com/PonasKovas/rlaunch/commit/f78f36876bba45fe4e7310f58086ddc63f27a57e.patch"; + hash = "sha256-rTS1khw1zt3i1AJ11BhAILcmaohAwVc7Qfl6Fc76Kvs="; + }) + ]; + # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch @@ -26,6 +36,7 @@ rustPlatform.buildRustPackage rec { description = "A lightweight application launcher for X11"; homepage = "https://github.com/PonasKovas/rlaunch"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ danc86 ]; }; }