From 6e969b64da19b07dd23c26e4a8a2082101774647 Mon Sep 17 00:00:00 2001
From: Emmet <librephoenix3@pm.me>
Date: Tue, 8 Aug 2023 21:47:35 -0500
Subject: [PATCH] Better implementation for blockbench override

---
 user/pkgs/blockbench.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/user/pkgs/blockbench.nix b/user/pkgs/blockbench.nix
index bdfa149b..83840c21 100644
--- a/user/pkgs/blockbench.nix
+++ b/user/pkgs/blockbench.nix
@@ -5,20 +5,19 @@
     (self: super:
       {
         blockbench-electron =
-        let
-        inherit (pkgs) fetchurl stdenv appimageTools makeWrapper electron_22;
-        in
           super.blockbench-electron.overrideAttrs (oldAttrs: rec {
           pname = "blockbench-electron";
+          alias = "blockbench";
           version = "4.8.1";
-          src = fetchurl {
+
+          src = super.fetchurl {
             inherit pname version;
             url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage";
             sha256 = "sha256-CE2wDOt1WBcYmPs4sEyZ3LYvKLequFZH0B3huMYHlwA=";
             name = "${pname}-${version}.AppImage";
             };
 
-          appimageContents = appimageTools.extractType2 {
+          appimageContents = super.appimageTools.extractType2 {
             inherit pname version;
             name = "${pname}-${version}";
             inherit src;
@@ -28,7 +27,7 @@
           dontConfigure = true;
           dontBuild = true;
           
-          nativeBuildInputs = [ makeWrapper ];
+          nativeBuildInputs = [ super.makeWrapper ];
           
           installPhase = ''
             runHook preInstall
@@ -42,9 +41,13 @@
           '';
           
           postFixup = ''
-            makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \
+            makeWrapper ${super.electron_22}/bin/electron $out/bin/${pname} \
               --add-flags $out/share/${pname}/resources/app.asar \
-              --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
+              --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ super.stdenv.cc.cc ]}"
+
+            makeWrapper ${super.electron_22}/bin/electron $out/bin/${alias} \
+              --add-flags $out/share/${pname}/resources/app.asar \
+              --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ super.stdenv.cc.cc ]}"
           '';
           });
       }