wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Merge pull request #11820 from hercules-ci/fix-cross-manual

Browse source 
Fix cross build (was: fix manual)
This commit is contained in:
Eelco Dolstra 2024-12-02 16:51:59 +01:00 • committed by GitHub
commit 8e0913b84a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.nix
View file

@ -124,18 +124,36 @@
# 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 =
inherit (final) lib; lib.makeScopeWithSplicing'
inherit officialRelease; {
src = self; inherit (final) splicePackages;
}); inherit (final.nixDependencies) newScope;
}
{
otherSplices = final.generateSplicesForMkScope "nixComponents";
f = import ./packaging/components.nix {
inherit (final) lib;
inherit officialRelease;
src = self;
};
};
# 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`.
nixDependencies = lib.makeScope final.newScope (import ./packaging/dependencies.nix { nixDependencies =
inherit inputs stdenv; lib.makeScopeWithSplicing'
pkgs = final; {
}); inherit (final) splicePackages;
inherit (final) newScope; # layered directly on pkgs, unlike nixComponents above
}
{
otherSplices = final.generateSplicesForMkScope "nixDependencies";
f = import ./packaging/dependencies.nix {
inherit inputs stdenv;
pkgs = final;
};
};
nix = final.nixComponents.nix-cli; nix = final.nixComponents.nix-cli;