From 0b3a807a63c3ff3e8743854098ce0ca2331b6076 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sun, 2 Feb 2025 11:51:36 +0700 Subject: [PATCH 1/2] cosmic-edit: Prefer --replace-fail for substituteInPlace --- pkgs/by-name/co/cosmic-edit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index ea87434200eb..6352e94547da 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -38,7 +38,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 = [ From 96f14317f9486bd93cfb9f13830efded9bc7c2eb Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sun, 2 Feb 2025 12:00:23 +0700 Subject: [PATCH 2/2] cosmic-edit: Remove wrapped LD_LIBRARY_PATH As per the comment `tiny-xclib` is now at version `0.2.4`. --- pkgs/by-name/co/cosmic-edit/package.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 6352e94547da..1c55ebbe18d7 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -79,20 +79,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-edit" \ - --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ - --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - vulkan-loader - libxkbcommon - wayland - ] - } + --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" ''; meta = with lib; {