diff --git a/pkgs/pineflash/default.nix b/pkgs/pineflash/default.nix
index 41209ef..8879ecc 100644
--- a/pkgs/pineflash/default.nix
+++ b/pkgs/pineflash/default.nix
@@ -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 = ''
diff --git a/pkgs/pineflash/fix-crash.patch b/pkgs/pineflash/fix-crash.patch
deleted file mode 100644
index 5231b71..0000000
--- a/pkgs/pineflash/fix-crash.patch
+++ /dev/null
@@ -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"),
-     }
- }
diff --git a/pkgs/pineflash/fix-nix-issues.patch b/pkgs/pineflash/fix-nix-issues.patch
new file mode 100644
index 0000000..47d14d0
--- /dev/null
+++ b/pkgs/pineflash/fix-nix-issues.patch
@@ -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")