From 8e1d6365e8fc95e3e9f1b09ae7886f483ab53e76 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 19 Feb 2026 11:03:44 +0100 Subject: [PATCH] ccls: hardcode script directory --- pkgs/by-name/cc/ccls/package.nix | 3 ++- pkgs/by-name/cc/ccls/wrapper | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cc/ccls/package.nix b/pkgs/by-name/cc/ccls/package.nix index c4d554e3968c..789bb27e164d 100644 --- a/pkgs/by-name/cc/ccls/package.nix +++ b/pkgs/by-name/cc/ccls/package.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: { substitute ${./wrapper} $out/bin/ccls \ --replace-fail '@clang@' '${llvmPackages.clang}' \ --replace-fail '@shell@' '${runtimeShell}' \ - --replace-fail '@wrapped@' "$wrapped" + --replace-fail '@wrapped@' "$wrapped" \ + --replace-fail '@out@' "$out" chmod --reference=$out/bin/$wrapped $out/bin/ccls ''; diff --git a/pkgs/by-name/cc/ccls/wrapper b/pkgs/by-name/cc/ccls/wrapper index 703bd88cfaed..294b60893a3f 100644 --- a/pkgs/by-name/cc/ccls/wrapper +++ b/pkgs/by-name/cc/ccls/wrapper @@ -1,11 +1,9 @@ #! @shell@ -e -dirpath=$(CDPATH= cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - printf -v extraArgs ',\"%s\"' \ $(cat @clang@/nix-support/libc-cflags \ @clang@/nix-support/libcxx-cxxflags) \ ${NIX_CFLAGS_COMPILE} initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}],\"resourceDir\":\"@clang@/resource-root\"}}" -exec -a "$0" "$dirpath/@wrapped@" "${initString}" "$@" +exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@"