From 084b5788259d19d92f2d6b6f0883d6ee59efaba0 Mon Sep 17 00:00:00 2001 From: kenji Date: Sat, 1 Feb 2025 15:05:14 +0100 Subject: [PATCH] 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`. --- pkgs/by-name/co/cosmic-term/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 258556379cbd..1c9dde666ba8 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -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; {