Merge pull request #331909 from pyrox0/rem-mkyarnpackage/dotenv-cli

dotenv-cli: remove usage of mkYarnPackage
NixOS · Aug 3, 2024 · bec2f5a · bec2f5a
2 parents 79860d1 + 1130d8c
commit bec2f5a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 31 deletions.
diff --git a/pkgs/by-name/do/dotenv-cli/package.json b/pkgs/by-name/do/dotenv-cli/package.json
diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix
@@ -1,10 +1,14 @@
 {
   lib,
-  mkYarnPackage,
+  stdenv,
   fetchYarnDeps,
   fetchFromGitHub,
-  nix-update-script
-}: mkYarnPackage rec {
+  yarnConfigHook,
+  npmHooks,
+  nodejs,
+  nix-update-script,
+}:
+stdenv.mkDerivation rec {
   pname = "dotenv-cli";
   version = "7.4.3";
 
@@ -15,12 +19,17 @@
     hash = "sha256-kR9LSHvbvKLuJBGrsmYMeqF3s8SF+/99OeNlKp9azI8=";
   };
 
-  packageJSON = ./package.json;
-  offlineCache = fetchYarnDeps {
+  yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
     hash = "sha256-Sx5DHUAXquqMqJgvhvHcRPqkfWN49+6icUQIos6OHCg=";
   };
 
+  nativeBuildInputs = [
+    yarnConfigHook
+    npmHooks.npmInstallHook
+    nodejs
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {