feat(devShells): move nodeCorepackShims to overlays

r17x · Jul 29, 2024 · b9fe05b · b9fe05b
1 parent 9de1f43
commit b9fe05b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/nix/devShells.nix b/nix/devShells.nix
@@ -51,21 +51,11 @@
               "."
             ];
 
-          nodeCorepackShims = pkgs.stdenv.mkDerivation {
-            name = "corepack-shims";
-            buildInputs = [ pkgs.nodejs ];
-            phases = [ "installPhase" ];
-            installPhase = ''
-              mkdir -p $out/bin
-              corepack enable --install-directory=$out/bin
-            '';
-          };
-
           mkNodeShell =
             name:
             let
               node = pkgs.${name};
-              corepackShim = nodeCorepackShims.overrideAttrs (_: {
+              corepackShim = pkgs.nodeCorepackShims.overrideAttrs (_: {
                 buildInputs = [ node ];
               });
             in
@@ -187,7 +177,7 @@
               # TODO: styled-ppx fix build
               # styled-ppx
               pkgs.nodejs_20
-              (nodeCorepackShims.overrideAttrs (_: {
+              (pkgs.nodeCorepackShims.overrideAttrs (_: {
                 buildInputs = [ pkgs.nodejs_20 ];
               }))
             ];

diff --git a/nix/overlays/nodePackages/default.nix b/nix/overlays/nodePackages/default.nix
@@ -3,5 +3,14 @@
   flake.overlays.nodePackages = _final: prev: {
     nodeEnv = prev.callPackage ./node2nix/node-env.nix { };
     nodePackages = prev.nodePackages // (prev.callPackage ./node2nix { });
+    nodeCorepackShims = prev.stdenv.mkDerivation {
+      name = "corepack-shims";
+      buildInputs = [ prev.nodejs ];
+      phases = [ "installPhase" ];
+      installPhase = ''
+        mkdir -p $out/bin
+        corepack enable --install-directory=$out/bin
+      '';
+    };
   };
 }