mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge pull request #27737 from puffnfresh/bug/alacritty-ld-library-path
alacritty: use patchelf instead of LD_LIBRARY_PATH
This commit is contained in:
commit
0e210f142c
@ -16,6 +16,18 @@
|
|||||||
|
|
||||||
with rustPlatform;
|
with rustPlatform;
|
||||||
|
|
||||||
|
let
|
||||||
|
rpathLibs = [
|
||||||
|
expat
|
||||||
|
freetype
|
||||||
|
fontconfig
|
||||||
|
libX11
|
||||||
|
libXcursor
|
||||||
|
libXxf86vm
|
||||||
|
libXi
|
||||||
|
];
|
||||||
|
in
|
||||||
|
|
||||||
buildRustPackage rec {
|
buildRustPackage rec {
|
||||||
name = "alacritty-unstable-2017-07-25";
|
name = "alacritty-unstable-2017-07-25";
|
||||||
|
|
||||||
@ -31,31 +43,25 @@ buildRustPackage rec {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
cmake
|
cmake
|
||||||
makeWrapper
|
makeWrapper
|
||||||
freetype
|
|
||||||
fontconfig
|
|
||||||
xclip
|
xclip
|
||||||
pkgconfig
|
pkgconfig
|
||||||
expat
|
] ++ rpathLibs;
|
||||||
libX11
|
|
||||||
libXcursor
|
|
||||||
libXxf86vm
|
|
||||||
libXi
|
|
||||||
];
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
for f in $(find target/release -maxdepth 1 -type f); do
|
for f in $(find target/release -maxdepth 1 -type f); do
|
||||||
cp $f $out/bin
|
cp $f $out/bin
|
||||||
done;
|
done;
|
||||||
wrapProgram $out/bin/alacritty --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath buildInputs}"
|
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
dontPatchELF = true;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "GPU-accelerated terminal emulator";
|
description = "GPU-accelerated terminal emulator";
|
||||||
homepage = https://github.com/jwilm/alacritty;
|
homepage = https://github.com/jwilm/alacritty;
|
||||||
license = with licenses; [ asl20 ];
|
license = with licenses; [ asl20 ];
|
||||||
maintainers = with maintainers; [ mic92 ];
|
maintainers = with maintainers; [ mic92 ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user