move fetchPnpmDeps and pnpmConfigHook into atomic-browser/package.nix

ngi-nix · Apr 11, 2024 · 9e76b77 · 9e76b77
1 parent 49ec51e
commit 9e76b77
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/flake.nix b/flake.nix
@@ -67,9 +67,7 @@
         mapAttrs dirToTest testDirs;
 
       callPackage = pkgs.newScope (
-        allPackages
-        // {inherit callPackage nixosTests;}
-        // {inherit (callPackage ./pkgs/build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps pnpmConfigHook;}
+        allPackages // {inherit callPackage nixosTests;}
       );
 
       pkgsByName = import ./pkgs/by-name {

diff --git a/pkgs/by-name/atomic-browser/package.nix b/pkgs/by-name/atomic-browser/package.nix
@@ -1,16 +1,20 @@
 {
+  callPackage,
   stdenv,
   fetchFromGitHub,
   lib,
   nodePackages,
-  fetchPnpmDeps,
-  pnpmConfigHook,
 }: let
   inherit
     (lib)
     licenses
     maintainers
     ;
+  inherit
+    (callPackage ../../build-support/node/fetch-pnpm-deps { })
+    fetchPnpmDeps
+    pnpmConfigHook
+    ;
 in
 stdenv.mkDerivation rec {
   pname = "atomic-browser";