fix: move fixes from repo to patch

This commit is contained in:
Nydragon 2025-01-07 22:53:06 +01:00
parent 8b4136e3d9
commit 9208515d0f
Signed by: nydragon
SSH key fingerprint: SHA256:WcjW5NJPQ8Dx4uQDmoIlVPLWE27Od3fxoe0IUvuoPHE
3 changed files with 29 additions and 17 deletions

View file

@ -28,17 +28,17 @@
rustPlatform.buildRustPackage rec {
pname = "pineflash";
version = "82605e4eeb48d25e59361ea42bcb01f02588b6aa";
version = "1cbe5547e19789e26faaef176c3d22a51e457e88";
src = fetchFromGitHub {
owner = "Nydragon";
owner = "Spagett1";
repo = "PineFlash";
rev = version;
hash = "sha256-s/yUB0mqXDD+InlWW/cDuk63K/mNZp158CD99RmHZrY=";
hash = "sha256-Cw2P/CNP6hn44RogAtqlXXNlDygE+ax3oUZ6F2tlFBw=";
fetchSubmodules = true;
};
cargoHash = "sha256-DuxKkC3+3Ynct0TAUNB8/O8b1/Cj4FoeUilxhYnSdwk=";
cargoHash = "sha256-x+7lqnv8UF1hcRkj4Uu7RCSDDx0vHOKumFfyRn6M/ao=";
nativeBuildInputs = [
curl
@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec {
patches = [
# remove when merged: https://github.com/Spagett1/pineflash/pull/86
./fix-crash.patch
./fix-nix-issues.patch
];
preFixup = ''

View file

@ -1,12 +0,0 @@
diff --git a/src/main.rs b/src/main.rs
index bcd4f0c..1395a73 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -529,6 +529,6 @@ fn main() {
}),
) {
Ok(_) => (),
- Err(error) => panic!("A massive error occured, not sure whats goin on here: \n {}"),
+ Err(error) => panic!("A massive error occured, not sure whats goin on here"),
}
}

View file

@ -0,0 +1,24 @@
diff --git a/src/main.rs b/src/main.rs
index bcd4f0c..1395a73 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -529,6 +529,6 @@ fn main() {
}),
) {
Ok(_) => (),
- Err(error) => panic!("A massive error occured, not sure whats goin on here: \n {}"),
+ Err(error) => panic!("A massive error occured, not sure whats goin on here"),
}
}
diff --git a/src/submodules/flash.rs b/src/submodules/flash.rs
index 5b224b2..cfdc861 100644
--- a/src/submodules/flash.rs
+++ b/src/submodules/flash.rs
@@ -183,7 +183,6 @@ impl Flasher {
#[cfg(target_os = "linux")]
let command = Command::new("pkexec")
- .env("PATH", "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:linux")
.arg(blisppath)
.arg("write")
.arg("-c")