nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkgs/top-level: refactor mkCrossPkgs

Browse Source
This commit is contained in:
Wolfgang Walther
2024-12-14 18:54:28 +01:00
parent 01a02e41f7
commit ba6262f2eb
1 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
pkgs/top-level/stage.nix
View File

@@ -189,6 +189,10 @@ let
})
] ++ nixpkgsArgs.overlays or [] ++ prevArgs.overlays or [];
});
# This is always cross.
mkCrossPkgs = name: crossAttrs: mkPkgs name (prevArgs: {
crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // crossAttrs;
});
in self: super: {
# This maps each entry in lib.systems.examples to its own package
# set. Each of these will contain all packages cross compiled for
@@ -199,45 +203,33 @@ let
nixpkgsFun (prevArgs: { crossSystem = (lib.systems.systemToAttrs (lib.defaultTo { } prevArgs.crossSystem or null)) // crossSystem; }))
lib.systems.examples;
pkgsLLVM = mkPkgs "pkgsLLVM" (prevArgs: {
# Bootstrap a cross stdenv using the LLVM toolchain.
# This is currently not possible when compiling natively,
# so we don't need to check whether we are cross already.
crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // {
useLLVM = true;
linker = "lld";
};
});
# Bootstrap a cross stdenv using the LLVM toolchain.
# This is currently not possible when compiling natively.
pkgsLLVM = mkCrossPkgs "pkgsLLVM" {
useLLVM = true;
linker = "lld";
};
pkgsLLVMLibc = mkPkgs "pkgsLLVMLibc" (prevArgs: {
# Bootstrap a cross stdenv using LLVM libc.
# This is currently not possible when compiling natively,
# so we don't need to check whether we are cross already.
crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // {
config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);
libc = "llvm";
};
});
# Bootstrap a cross stdenv using LLVM libc.
# This is currently not possible when compiling natively.
pkgsLLVMLibc = mkCrossPkgs "pkgsLLVMLibc" {
config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);
libc = "llvm";
};
pkgsArocc = mkPkgs "pkgsArocc" (prevArgs: {
# Bootstrap a cross stdenv using the Aro C compiler.
# This is currently not possible when compiling natively,
# so we don't need to check whether we are cross already.
crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // {
useArocc = true;
linker = "lld";
};
});
# Bootstrap a cross stdenv using the Aro C compiler.
# This is currently not possible when compiling natively.
pkgsArocc = mkCrossPkgs "pkgsArocc" {
useArocc = true;
linker = "lld";
};
pkgsZig = mkPkgs "pkgsZig" (prevArgs: {
# Bootstrap a cross stdenv using the Zig toolchain.
# This is currently not possible when compiling natively,
# so we don't need to check whether we are cross already.
crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // {
useZig = true;
linker = "lld";
};
});
# Bootstrap a cross stdenv using the Zig toolchain.
# This is currently not possible when compiling natively.
pkgsZig = mkCrossPkgs "pkgsZig" {
useZig = true;
linker = "lld";
};
# All packages built with the Musl libc. This will override the
# default GNU libc on Linux systems. Non-Linux systems are not
@@ -285,14 +277,12 @@ let
# Fully static packages.
# Currently uses Musl on Linux (couldn’t get static glibc to work).
pkgsStatic = mkPkgs "pkgsStatic" (prevArgs: {
crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // {
isStatic = true;
} // lib.optionalAttrs stdenv.hostPlatform.isLinux {
config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);
} // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") {
gcc = { abi = "elfv2"; } // stdenv.hostPlatform.gcc or {};
};
pkgsStatic = mkCrossPkgs "pkgsStatic" ({
isStatic = true;
} // lib.optionalAttrs stdenv.hostPlatform.isLinux {
config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);
} // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") {
gcc = { abi = "elfv2"; } // stdenv.hostPlatform.gcc or {};
});
pkgsExtraHardening = mkPkgs "pkgsExtraHardening" (_: {