diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-20 02:59:22 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-25 00:04:58 +0200 |
commit | 84c6c827b76bd7296355fd5cc6c96eff25968f6e (patch) | |
tree | cadbeaf219eae063a196de402c23d548302c4f09 /pkgs/webapps/grocy/default.nix | |
parent | b1566203381206632b4f00b7120c4484089ca924 (diff) | |
download | NUR-84c6c827b76bd7296355fd5cc6c96eff25968f6e.tar.gz NUR-84c6c827b76bd7296355fd5cc6c96eff25968f6e.tar.zst NUR-84c6c827b76bd7296355fd5cc6c96eff25968f6e.zip |
Remove yarn2nixPackage from lib
Diffstat (limited to 'pkgs/webapps/grocy/default.nix')
-rw-r--r-- | pkgs/webapps/grocy/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/webapps/grocy/default.nix b/pkgs/webapps/grocy/default.nix index 3a8e55a5..f87f6ec0 100644 --- a/pkgs/webapps/grocy/default.nix +++ b/pkgs/webapps/grocy/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { varDir ? "/var/lib/grocy", stdenv, callPackage, composerEnv, fetchurl, mylibs, runCommand, git, which, jq }: | 1 | { varDir ? "/var/lib/grocy", stdenv, callPackage, composerEnv, fetchurl, mylibs, runCommand, git, which, jq, yarn2nix-moretea }: |
2 | let | 2 | let |
3 | version = "2.6.1-1"; | 3 | version = "2.6.1-1"; |
4 | packagesource = mylibs.fetchedGithub ./grocy.json; | 4 | packagesource = mylibs.fetchedGithub ./grocy.json; |
@@ -11,7 +11,7 @@ let | |||
11 | cp yarn.lock $out/ | 11 | cp yarn.lock $out/ |
12 | ''; | 12 | ''; |
13 | }); | 13 | }); |
14 | yarnModules = mylibs.yarn2nixPackage.mkYarnModules rec { | 14 | yarnModules = yarn2nix-moretea.mkYarnModules rec { |
15 | name = "grocy-yarn"; | 15 | name = "grocy-yarn"; |
16 | pname = name; | 16 | pname = name; |
17 | version = version; | 17 | version = version; |
@@ -20,7 +20,7 @@ let | |||
20 | yarnNix = ./yarn-packages.nix; | 20 | yarnNix = ./yarn-packages.nix; |
21 | pkgConfig = { | 21 | pkgConfig = { |
22 | all = { | 22 | all = { |
23 | buildInputs = [ git which mylibs.yarn2nixPackage.src ]; | 23 | buildInputs = [ git which ]; |
24 | }; | 24 | }; |
25 | }; | 25 | }; |
26 | }; | 26 | }; |