ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-10 08:39:08 +03:00
Code Issues Projects Releases Wiki Activity

cvise: fix shebang for --command= option

Browse Source 
Upstream `cvise` changed the way it encodes shebang from hardcoded value
to `/bin` + value:

d99d82ce8e

This broke `nixpkgs` substitute hack and broke the option.

I proposed upstream to use `/usr/bin/env bash` indirection instead. This
change pulls in this proposed change.
This commit is contained in:
Sergei Trofimovich 2023-11-15 20:16:34 +00:00
parent 2387a37fa0
commit 4fa9300cb0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/misc/cvise/default.nix
View File

@ -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'"