From 49ec51ec7fe8421a3c8a7018afa66c4dbcfec14b Mon Sep 17 00:00:00 2001 From: Albert Chae Date: Thu, 11 Apr 2024 05:18:40 -0700 Subject: [PATCH] move fetch-pnpm-deps to callPackage's scope --- flake.nix | 5 +++-- pkgs/by-name/atomic-browser/package.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 7eb5f9c4..9b18506c 100644 --- 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 index 01407a30..4442fa15 100644 --- 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";