blesh: patch build helper shebangs
Assisted-by: Codex CLI with gpt-5.5 default (OpenAI)
This commit is contained in:
@@ -28,10 +28,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# Fix the cache invalidation not working; see
|
||||
# https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4641313131
|
||||
./fix-cache-invalidation.patch
|
||||
# ble.sh reaches a runtime-dir fallback under the install base when the
|
||||
# others are unusable (always on WSL); see
|
||||
# https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4686973408
|
||||
./skip-readonly-runtime-dir.patch
|
||||
];
|
||||
|
||||
# ble.sh embeds the commit id, normally read from .git, which fetchFromGitHub omits.
|
||||
@@ -41,6 +37,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
"BLE_GIT_BRANCH=master"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build make_command.sh make
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
# auto-detection runs `make -n check` without makeFlags, which fails without BLE_GIT_COMMIT_ID
|
||||
checkTarget = "check";
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/ble.pp
|
||||
+++ b/ble.pp
|
||||
@@ -1934,6 +1934,7 @@
|
||||
function ble/base/initialize-runtime-directory/.base {
|
||||
local tmp_dir=$_ble_base/run
|
||||
if [[ ! -d $tmp_dir ]]; then
|
||||
+ [[ -w $_ble_base ]] || return 1
|
||||
ble/bin/mkdir -p "$tmp_dir" || return 1
|
||||
ble/bin/chmod a+rwxt "$tmp_dir" || return 1
|
||||
fi
|
||||
Reference in New Issue
Block a user