cosmic-term: Remove wrapped LD_LIBRARY_PATH and prefer --substitute-fail (#378300)

* cosmic-term: substituteInPlace use --replace-fail

* cosmic-term: Remove wrapped LD_LIBRARY_PATH

As per the comment `tiny-xclib` is now at version `0.2.4`.
This commit is contained in:
kenji 2025-02-01 15:05:14 +01:00 committed by GitHub
parent c8cef28d39
commit 084b578825
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
env.VERGEN_GIT_SHA = src.rev;
postPatch = ''
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
'';
nativeBuildInputs = [
@ -78,19 +78,9 @@ rustPlatform.buildRustPackage rec {
"-Wl,--pop-state"
];
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
postInstall = ''
wrapProgram "$out/bin/cosmic-term" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
libxkbcommon
vulkan-loader
xorg.libX11
xorg.libXcursor
xorg.libXi
]
}
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share"
'';
meta = with lib; {