diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-11-17 05:06:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-17 05:06:55 -0500 |
commit | 0fd5ff65bc78a8c0bc963e8190349aff593a1d5f (patch) | |
tree | 03b48c1c36734edba4882d0a0dd747523210f7ac /pkgs/development/tools/misc | |
parent | 16448641a76d7c83bb9155634f71d252d36a84f8 (diff) | |
parent | 4fa9300cb0e3a73f7195bf71fac949b950b089b7 (diff) | |
download | nixpkgs-0fd5ff65bc78a8c0bc963e8190349aff593a1d5f.tar nixpkgs-0fd5ff65bc78a8c0bc963e8190349aff593a1d5f.tar.gz nixpkgs-0fd5ff65bc78a8c0bc963e8190349aff593a1d5f.tar.bz2 nixpkgs-0fd5ff65bc78a8c0bc963e8190349aff593a1d5f.tar.lz nixpkgs-0fd5ff65bc78a8c0bc963e8190349aff593a1d5f.tar.xz nixpkgs-0fd5ff65bc78a8c0bc963e8190349aff593a1d5f.tar.zst nixpkgs-0fd5ff65bc78a8c0bc963e8190349aff593a1d5f.zip |
Merge pull request #267736 from trofi/cvise-vix-command
cvise: fix shebang for `--command=` option
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/cvise/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 56bd85b7721..f65b0386cfd 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, fetchpatch , bash , cmake , colordiff @@ -29,6 +30,14 @@ buildPythonApplication rec { patches = [ # Refer to unifdef by absolute path. ./unifdef.patch + + # Refer to shell via /usr/bin/env: + # https://github.com/marxin/cvise/pull/121 + (fetchpatch { + name = "env-shell.patch"; + url = "https://github.com/marxin/cvise/commit/6a416eb590be978a2ad25c610974fdde84e88651.patch"; + hash = "sha256-Kn6+TXP+wJpMs6jrgsa9OwjXf6vmIgGzny8jg3dfKWA="; + }) ]; postPatch = '' @@ -37,10 +46,6 @@ buildPythonApplication rec { substituteInPlace CMakeLists.txt \ --replace " -Werror " " " - # 'cvise --command=...' generates a script with hardcoded shebang. - substituteInPlace cvise.py \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" - substituteInPlace cvise/utils/testing.py \ --replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \ --replace "'colordiff'" "'${colordiff}/bin/colordiff'" |