move fetch-pnpm-deps to callPackage's scope

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

Hide file tree

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

diff --git a/pkgs/by-name/atomic-browser/package.nix b/pkgs/by-name/atomic-browser/package.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   lib,
   nodePackages,
@@ -12,7 +12,7 @@
     maintainers
     ;
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "atomic-browser";
   version = "v0.37.0";