Unverified Commit 3f1aa79d authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #203423 from raphaelr/rlaunch-aarch64

rlaunch: fix build on aarch64-linux
parents 9f16b00e e48d21ab
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
{ 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 ];
  };
}