blockbench: 5.0.7 -> 5.1.1

Co-authored-by: TomaSajt <62384384+TomaSajt@users.noreply.github.com>

pkgs/by-name/bl/blockbench/dont-assume-opening-app-asar.patch

@@ -0,0 +1,15 @@
+diff --git a/js/desktop.js b/js/desktop.js
+index f3fcb25..a92a884 100644
+--- a/js/desktop.js
++++ b/js/desktop.js
+@@ -123,7 +123,9 @@ export function loadOpenWithBlockbenchFile() {
+ 	})
+ 	if (electron.process.argv.length >= 2) {
+ 		let path = electron.process.argv.last();
+-		load(path);
++		if (!path.endsWith("app.asar")) {
++			load(path);
++		}
+ 	}
+ }
+ console.log('Electron '+process.versions.electron+', Node '+process.versions.node)

pkgs/by-name/bl/blockbench/package.nix

@@ -3,7 +3,6 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
-  fetchpatch,
   makeWrapper,
   imagemagick,
   copyDesktopItems,
@@ -13,15 +12,22 @@
 
 buildNpmPackage rec {
   pname = "blockbench";
-  version = "5.0.7";
+  version = "5.1.1";
 
   src = fetchFromGitHub {
     owner = "JannisX11";
     repo = "blockbench";
     tag = "v${version}";
-    hash = "sha256-JXOO2+UPMOGSuvez8ektbD5waPKatMggKn+MuH9Qkrs=";
+    hash = "sha256-bvstexoBQylLmTMzAhId+1HvC3iiL3tPahGhwZ5Yroo=";
   };
 
+  patches = [
+    # On linux we're running Blockbench by giving the path to the app.asar file to the electron executable,
+    # but Blockbench assumes paths at the and og the argv are files to be opened
+    # This patch disables trying to open the app.asar file
+    ./dont-assume-opening-app-asar.patch
+  ];
+
   nativeBuildInputs = [
     makeWrapper
   ]
@@ -30,16 +36,7 @@ buildNpmPackage rec {
     copyDesktopItems
   ];
 
-  patches = [
-    (fetchpatch {
-      # fixes https://github.com/JannisX11/blockbench/issues/3237
-      name = "bump-electron-builder.patch";
-      url = "https://github.com/JannisX11/blockbench/commit/dee9ae271f252d4bb3f98c13c4a1abaaeedd1feb.patch";
-      hash = "sha256-XpdqeCKoWsUieOMWhxVsEQ2r0qR+iiXKnVRfNYERDQs=";
-    })
-  ];
-
-  npmDepsHash = "sha256-T3yenZCkOrGOWJBxqe0RG39jWYfpsXStblf5Jx4dtF0=";
+  npmDepsHash = "sha256-1CCYk3cKFdLhx8oC5XreFCf5sL/7eKjOfXCmHt7hZrM=";
   makeCacheWritable = true;
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;