nvfetcher

pkgs/default.nix

@@ -1,8 +1,10 @@
-{pkgs, ...}: {
+{pkgs, ...}: let
+  nv_generated = pkgs.callPackage ../_sources/generated.nix {};
+in {
   jdnbtexplorer = pkgs.qt6Packages.callPackage ./jdnbtexplorer {};
   gamesand = pkgs.callPackage ./gamesand {};
   pince = pkgs.callPackage ./pince {};
   binaryninja-personal = pkgs.qt6Packages.callPackage ./binaryninja-personal {};
-  sobercookie = pkgs.callPackage ./sobercookie {};
+  sobercookie = pkgs.callPackage ./sobercookie {inherit nv_generated;};
   krunker = pkgs.callPackage ./krunker {};
 }

pkgs/krunker/default.nix

@@ -3,6 +3,7 @@
   fetchurl,
   imagemagick,
 }: let
+  # TODO: use https://github.com/KraXen72/crankshaft, can be tracked with nvfetcher
   pname = "krunker";
   version = "0.0.1";
   src = fetchurl {

pkgs/sobercookie/default.nix

@@ -1,7 +1,6 @@
 {
   stdenv,
   lib,
-  fetchFromGitHub,
   pkg-config,
   bash,
   makeWrapper,
@@ -10,51 +9,45 @@
   gtk3,
   wrapGAppsHook,
   luajit,
+  nv_generated,
 }:
-stdenv.mkDerivation rec {
-  pname = "sobercookie";
-  src = fetchFromGitHub {
-    owner = "xunuwu";
-    repo = "sobercookie";
-    rev = "0e082ab538a2eed206ab228ed50c5251323abdf2";
-    sha256 = "sha256-hdW/MqzphyAy6bcN3LDFFRV0t9ZHOx2b96hu9acZ7+E=";
-  };
-  version = "0.0.1";
+stdenv.mkDerivation (nv_generated.sobercookie
+  // (let
+    lgi = luajitPackages.lgi;
+  in {
+    buildInputs = [bash luajit];
 
-  buildInputs = [bash luajit];
+    nativeBuildInputs = [
+      makeWrapper
+      pkg-config
+      wrapGAppsHook
+      gobject-introspection
+    ];
 
-  nativeBuildInputs = [
-    makeWrapper
-    pkg-config
-    wrapGAppsHook
-    gobject-introspection
-  ];
+    propagatedBuildInputs = [gtk3];
 
-  propagatedBuildInputs = [gtk3];
-  lgi = luajitPackages.lgi;
+    installPhase = ''
+      runHook preInstall
 
-  installPhase = ''
-    runHook preInstall
+      mkdir -p $out/bin
+      cp sobercookie $out/bin/sobercookie
+      cp launcher.lua $out/bin/sobercookie-launcher
 
-    mkdir -p $out/bin
-    cp sobercookie $out/bin/sobercookie
-    cp launcher.lua $out/bin/sobercookie-launcher
+      mkdir -p $out/share/applications
+      cp sobercookie-launcher.desktop $out/share/applications
 
-    mkdir -p $out/share/applications
-    cp sobercookie-launcher.desktop $out/share/applications
+      runHook postInstall
+    '';
 
-    runHook postInstall
-  '';
+    preFixup = ''
+      gappsWrapperArgs+=(
+        --prefix LUA_PATH : "./?.lua;${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua"
+        --prefix LUA_CPATH : "./?.so;${lgi}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/loadall.so"
+      )
+    '';
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix LUA_PATH : "./?.lua;${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua"
-      --prefix LUA_CPATH : "./?.so;${lgi}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/loadall.so"
-    )
-  '';
-
-  postFixup = ''
-    wrapProgram $out/bin/sobercookie \
-      --prefix PATH : ${lib.makeBinPath [bash]}
-  '';
-}
+    postFixup = ''
+      wrapProgram $out/bin/sobercookie \
+        --prefix PATH : ${lib.makeBinPath [bash]}
+    '';
+  }))