pyrox.dev
lol
cvise: fix shebang for `--command=` option
Upstream `cvise` changed the way it encodes shebang from hardcoded value
to `/bin` + value:
https://github.com/marxin/cvise/commit/d99d82ce8e9d0991e629eb693f6a1187dc752938
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.
+9
-4
pkgs/development/tools/misc/cvise/default.nix
+9
-4
pkgs/development/tools/misc/cvise/default.nix
···
1
1
{ lib
2
2
, buildPythonApplication
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, bash
5
6
, cmake
6
7
, colordiff
···
29
30
patches = [
30
31
# Refer to unifdef by absolute path.
31
32
./unifdef.patch
33
+
34
+
# Refer to shell via /usr/bin/env:
35
+
# https://github.com/marxin/cvise/pull/121
36
+
(fetchpatch {
37
+
name = "env-shell.patch";
38
+
url = "https://github.com/marxin/cvise/commit/6a416eb590be978a2ad25c610974fdde84e88651.patch";
39
+
hash = "sha256-Kn6+TXP+wJpMs6jrgsa9OwjXf6vmIgGzny8jg3dfKWA=";
40
+
})
32
41
];
33
42
34
43
postPatch = ''
···
36
45
# tested compilers.
37
46
substituteInPlace CMakeLists.txt \
38
47
--replace " -Werror " " "
39
-
40
-
# 'cvise --command=...' generates a script with hardcoded shebang.
41
-
substituteInPlace cvise.py \
42
-
--replace "#!/bin/bash" "#!${bash}/bin/bash"
43
48
44
49
substituteInPlace cvise/utils/testing.py \
45
50
--replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \