components.nix: Simplify

This commit is contained in:
Robert Hensing 2024-06-26 04:17:30 +02:00
parent 25dc12aab1
commit c24dbf1457
2 changed files with 2 additions and 5 deletions

View file

@ -176,10 +176,7 @@
# without "polluting" the top level "`pkgs`" attrset. # without "polluting" the top level "`pkgs`" attrset.
# This also has the benefit of providing us with a distinct set of packages # This also has the benefit of providing us with a distinct set of packages
# we can iterate over. # we can iterate over.
nixComponents = lib.makeScope final.nixDependencies.newScope (import ./packaging/components.nix { nixComponents = lib.makeScope final.nixDependencies.newScope (import ./packaging/components.nix);
pkgs = final;
inherit stdenv versionSuffix;
});
# The dependencies are in their own scope, so that they don't have to be # The dependencies are in their own scope, so that they don't have to be
# in Nixpkgs top level `pkgs` or `nixComponents`. # in Nixpkgs top level `pkgs` or `nixComponents`.

View file

@ -1,4 +1,4 @@
{pkgs, stdenv, versionSuffix}: scope: scope:
let let
inherit (scope) callPackage; inherit (scope) callPackage;
in in