Merge pull request #129823 from Mic92/leftwm

leftwm: set rpath in all executables
This commit is contained in:
Jörg Thalheim 2021-07-10 14:07:46 +01:00 committed by GitHub
commit ac7bd48b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: { lib, fetchFromGitHub, rustPlatform, libX11, libXinerama }:
let let
rpath = lib.makeLibraryPath [ libXinerama libX11 ]; rpathLibs = [ libXinerama libX11 ];
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -17,15 +17,16 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE="; cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE=";
nativeBuildInputs = [ makeWrapper ]; buildInputs = rpathLibs;
buildInputs = [ libX11 libXinerama ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" for p in $out/bin/leftwm*; do
wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}" patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $p
wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" done
''; '';
dontPatchELF = true;
meta = with lib; { meta = with lib; {
description = "A tiling window manager for the adventurer"; description = "A tiling window manager for the adventurer";
homepage = "https://github.com/leftwm/leftwm"; homepage = "https://github.com/leftwm/leftwm";