fix: vpkmerge and grimorie are using nvfetch now

pkgs/by-name/gr/grimorie/package.nix

@@ -11,17 +11,22 @@
   pkg-config,
   makeWrapper,
   electron_39,
+  vpkmerge,
   sqlite,
+  callPackage,
 }: let
   version = "1.13.1";
+  sources = callPackage ../../../../_sources/generated.nix {};
 
-  src = fetchFromGitHub {
-    owner = "Slush97";
-    repo = "grimoire";
-    rev = "v${version}";
-    hash = "sha256-GSl0whxFtw6tHKBLB3yOulpQGAw8Hqn+2ipj+1zQHLY=";
-  };
+  src = sources.grimoire.src;
+  # src = fetchFromGitHub {
+  #   owner = "Slush97";
+  #   repo = "grimoire";
+  #   rev = "v${version}";
+  #   hash = "sha256-GSl0whxFtw6tHKBLB3yOulpQGAw8Hqn+2ipj+1zQHLY=";
+  # };
 
+  # grimoire-social-src = sources.grimoire-social.src;
   grimoire-social-src = fetchFromGitHub {
     owner = "Slush97";
     repo = "grimoire-social";
@@ -33,13 +38,13 @@
     pname = "grimoire";
     inherit version src;
     fetcherVersion = 2;
-    hash = "sha256-iFxXEb5iKRM0Bp+YrQZhsGXHa0pfPMWQDah/SUBJVBE=";
-  };
-
-  vpkmerge-bin = fetchurl {
-    url = "https://github.com/Slush97/vpkmerge/releases/download/v0.4.0/vpkmerge-linux-x86_64";
-    sha256 = "6860a989335afec0aa19544cf30cbebac9dc6b88af3f3a8d9c3340a6435fa045";
+    hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s=";
   };
+  # Put into its own flake
+  # vpkmerge-bin = fetchurl {
+  #   url = "https://github.com/Slush97/vpkmerge/releases/download/v0.4.0/vpkmerge-linux-x86_64";
+  #   sha256 = "6860a989335afec0aa19544cf30cbebac9dc6b88af3f3a8d9c3340a6435fa045";
+  # };
 in
   stdenv.mkDerivation {
     pname = "grimoire";
@@ -70,7 +75,7 @@ in
       chmod -R u+w ../grimoire-social
 
       mkdir -p resources/vpkmerge
-      cp ${vpkmerge-bin} resources/vpkmerge/vpkmerge-linux-x86_64
+      cp ${vpkmerge}/bin/vpkmerge resources/vpkmerge/vpkmerge-linux-x86_64
       chmod +x resources/vpkmerge/vpkmerge-linux-x86_64
     '';