movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

pkgs/top-level: refactor mkHybridPkgs

Browse source
This commit is contained in:
Wolfgang Walther 2024-12-14 19:01:31 +01:00
parent ba6262f2eb
commit 69775e2deb
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
1 changed files with 23 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

52
pkgs/top-level/stage.nix
View file

@ -191,7 +191,13 @@ let
}); });
# This is always cross. # This is always cross.
mkCrossPkgs = name: crossAttrs: mkPkgs name (prevArgs: { mkCrossPkgs = name: crossAttrs: mkPkgs name (prevArgs: {
crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // crossAttrs; crossSystem =
(lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // crossAttrs;
});
# This is only cross when we are already cross, otherwise local.
mkHybridPkgs = name: hybridAttrs: mkPkgs name (prevArgs: {
${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} =
(lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // hybridAttrs;
}); });
in self: super: { in self: super: {
# This maps each entry in lib.systems.examples to its own package # This maps each entry in lib.systems.examples to its own package
@ -234,33 +240,24 @@ let
# All packages built with the Musl libc. This will override the # All packages built with the Musl libc. This will override the
# default GNU libc on Linux systems. Non-Linux systems are not # default GNU libc on Linux systems. Non-Linux systems are not
# supported. 32-bit is also not supported. # supported. 32-bit is also not supported.
pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then mkPkgs "pkgsMusl" (prevArgs: { pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then mkHybridPkgs "pkgsMusl" {
${if stdenv.hostPlatform == stdenv.buildPlatform config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);
then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { } else throw "Musl libc only supports 64-bit Linux systems.";
config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);
};
}) else throw "Musl libc only supports 64-bit Linux systems.";
# All packages built for i686 Linux. # All packages built for i686 Linux.
# Used by wine, firefox with debugging version of Flash, ... # Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then mkPkgs "pkgsi686Linux" (prevArgs: { pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then mkHybridPkgs "pkgsi686Linux" {
${if stdenv.hostPlatform == stdenv.buildPlatform config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // {
then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { cpu = lib.systems.parse.cpuTypes.i686;
config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { });
cpu = lib.systems.parse.cpuTypes.i686; } else throw "i686 Linux package set can only be used with the x86 family.";
});
};
}) else throw "i686 Linux package set can only be used with the x86 family.";
# x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages
pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then mkPkgs "pkgsx86_64Darwin" (prevArgs: { pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then mkHybridPkgs "pkgsx86_64Darwin" {
${if stdenv.hostPlatform == stdenv.buildPlatform config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // {
then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { cpu = lib.systems.parse.cpuTypes.x86_64;
config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { });
cpu = lib.systems.parse.cpuTypes.x86_64; } else throw "x86_64 Darwin package set can only be used on Darwin systems.";
});
};
}) else throw "x86_64 Darwin package set can only be used on Darwin systems.";
# If already linux: the same package set unaltered # If already linux: the same package set unaltered
# Otherwise, return a linux package set for the current cpu architecture string. # Otherwise, return a linux package set for the current cpu architecture string.
@ -268,12 +265,9 @@ let
pkgsLinux = pkgsLinux =
if stdenv.hostPlatform.isLinux if stdenv.hostPlatform.isLinux
then self then self
else mkPkgs "pkgsLinux" (prevArgs: { else mkHybridPkgs "pkgsLinux" {
${if stdenv.hostPlatform == stdenv.buildPlatform config = lib.systems.parse.tripleFromSystem (lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux").parsed;
then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { };
config = lib.systems.parse.tripleFromSystem (lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux").parsed;
};
});
# Fully static packages. # Fully static packages.
# Currently uses Musl on Linux (couldn’t get static glibc to work). # Currently uses Musl on Linux (couldn’t get static glibc to work).