X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=flakes%2Fgrocy%2Fdefault.nix;fp=pkgs%2Fwebapps%2Fgrocy%2Fdefault.nix;h=26b6ed847f7a05118211e4899490a5df5096076e;hp=f87f6ec0df20672dcac2ed16b0c497e366934eaa;hb=1a64deeb894dc95e2645a75771732c6cc53a79ad;hpb=fa25ffd4583cc362075cd5e1b4130f33306103f0

diff --git a/pkgs/webapps/grocy/default.nix b/flakes/grocy/default.nix
similarity index 83%
rename from pkgs/webapps/grocy/default.nix
rename to flakes/grocy/default.nix
index f87f6ec..26b6ed8 100644
--- a/pkgs/webapps/grocy/default.nix
+++ b/flakes/grocy/default.nix
@@ -1,8 +1,9 @@
-{ varDir ? "/var/lib/grocy", stdenv, callPackage, composerEnv, fetchurl, mylibs, runCommand, git, which, jq, yarn2nix-moretea }:
+{ varDir ? "/var/lib/grocy", stdenv, callPackage, composerEnv, fetchurl, src, runCommand, git, which, jq, yarn2nix-moretea }:
 let
   version = "2.6.1-1";
-  packagesource = mylibs.fetchedGithub ./grocy.json;
-  patchedPackages = stdenv.mkDerivation (packagesource // rec {
+  patchedPackages = stdenv.mkDerivation rec {
+    name = "grocy";
+    inherit src;
     buildInputs = [ jq ];
     patches = [ ./yarn.patch ];
     installPhase = ''
@@ -10,7 +11,7 @@ let
       cat package.json | jq -r '.version = "${version}"' > $out/package.json
       cp yarn.lock $out/
       '';
-  });
+  };
   yarnModules = yarn2nix-moretea.mkYarnModules rec {
     name = "grocy-yarn";
     pname = name;
@@ -26,8 +27,9 @@ let
   };
   app = composerEnv.buildPackage (
     import ./php-packages.nix { inherit composerEnv fetchurl; } //
-    packagesource //
     {
+      name = "grocy";
+      inherit src;
       noDev = true;
       buildInputs = [ yarnModules ];
       postInstall = ''