lib: Make platform predicates more ergonomic to use
`hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin hostPlatform.parsed`
This commit is contained in:
parent
da8b2f1412
commit
2e7ec6fb70
|
@ -1,6 +1,9 @@
|
||||||
|
let inherit (import ../attrsets.nix) mapAttrs; in
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
doubles = import ./doubles.nix;
|
doubles = import ./doubles.nix;
|
||||||
parse = import ./parse.nix;
|
parse = import ./parse.nix;
|
||||||
|
inspect = import ./inspect.nix;
|
||||||
platforms = import ./platforms.nix;
|
platforms = import ./platforms.nix;
|
||||||
|
|
||||||
# Elaborate a `localSystem` or `crossSystem` so that it contains everything
|
# Elaborate a `localSystem` or `crossSystem` so that it contains everything
|
||||||
|
@ -18,6 +21,7 @@ rec {
|
||||||
config = parse.tripleFromSystem final.parsed;
|
config = parse.tripleFromSystem final.parsed;
|
||||||
# Just a guess, based on `system`
|
# Just a guess, based on `system`
|
||||||
platform = platforms.selectBySystem final.system;
|
platform = platforms.selectBySystem final.system;
|
||||||
} // args;
|
} // mapAttrs (n: v: v final.parsed) inspect.predicates
|
||||||
|
// args;
|
||||||
in final;
|
in final;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
let lists = import ../lists.nix; in
|
|
||||||
let parse = import ./parse.nix; in
|
|
||||||
let inherit (import ../attrsets.nix) matchAttrs; in
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
lists = import ../lists.nix;
|
||||||
|
parse = import ./parse.nix;
|
||||||
|
inherit (import ./inspect.nix) predicates;
|
||||||
|
inherit (import ../attrsets.nix) matchAttrs;
|
||||||
|
|
||||||
all = [
|
all = [
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
"armv5tel-linux" "armv6l-linux" "armv7l-linux"
|
"armv5tel-linux" "armv6l-linux" "armv7l-linux"
|
||||||
|
@ -25,20 +26,21 @@ in rec {
|
||||||
allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
|
allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
|
||||||
none = [];
|
none = [];
|
||||||
|
|
||||||
arm = filterDoubles (matchAttrs { cpu = { family = "arm"; bits = 32; }; });
|
arm = filterDoubles predicates.isArm32;
|
||||||
i686 = filterDoubles parse.isi686;
|
i686 = filterDoubles predicates.isi686;
|
||||||
mips = filterDoubles (matchAttrs { cpu = { family = "mips"; }; });
|
mips = filterDoubles predicates.isMips;
|
||||||
x86_64 = filterDoubles parse.isx86_64;
|
x86_64 = filterDoubles predicates.isx86_64;
|
||||||
|
|
||||||
cygwin = filterDoubles parse.isCygwin;
|
cygwin = filterDoubles predicates.isCygwin;
|
||||||
darwin = filterDoubles parse.isDarwin;
|
darwin = filterDoubles predicates.isDarwin;
|
||||||
freebsd = filterDoubles (matchAttrs { kernel = parse.kernels.freebsd; });
|
freebsd = filterDoubles predicates.isFreeBSD;
|
||||||
gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); # Should be better
|
# Should be better, but MinGW is unclear, and HURD is bit-rotted.
|
||||||
illumos = filterDoubles (matchAttrs { kernel = parse.kernels.solaris; });
|
gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; });
|
||||||
linux = filterDoubles parse.isLinux;
|
illumos = filterDoubles predicates.isSunOS;
|
||||||
netbsd = filterDoubles (matchAttrs { kernel = parse.kernels.netbsd; });
|
linux = filterDoubles predicates.isLinux;
|
||||||
openbsd = filterDoubles (matchAttrs { kernel = parse.kernels.openbsd; });
|
netbsd = filterDoubles predicates.isNetBSD;
|
||||||
unix = filterDoubles parse.isUnix;
|
openbsd = filterDoubles predicates.isOpenBSD;
|
||||||
|
unix = filterDoubles predicates.isUnix;
|
||||||
|
|
||||||
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"];
|
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"];
|
||||||
}
|
}
|
||||||
|
|
36
lib/systems/inspect.nix
Normal file
36
lib/systems/inspect.nix
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
with import ./parse.nix;
|
||||||
|
with import ../attrsets.nix;
|
||||||
|
|
||||||
|
rec {
|
||||||
|
patterns = {
|
||||||
|
"32bit" = { cpu = { bits = 32; }; };
|
||||||
|
"64bit" = { cpu = { bits = 64; }; };
|
||||||
|
i686 = { cpu = cpuTypes.i686; };
|
||||||
|
x86_64 = { cpu = cpuTypes.x86_64; };
|
||||||
|
Arm = { cpu = { family = "arm"; }; };
|
||||||
|
Mips = { cpu = { family = "mips"; }; };
|
||||||
|
BigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; };
|
||||||
|
LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
|
||||||
|
|
||||||
|
Unix = { kernel = { families = { inherit (kernelFamilies) unix; }; }; };
|
||||||
|
BSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
|
||||||
|
|
||||||
|
Darwin = { kernel = kernels.darwin; };
|
||||||
|
Linux = { kernel = kernels.linux; };
|
||||||
|
SunOS = { kernel = kernels.solaris; };
|
||||||
|
FreeBSD = { kernel = kernels.freebsd; };
|
||||||
|
NetBSD = { kernel = kernels.netbsd; };
|
||||||
|
OpenBSD = { kernel = kernels.openbsd; };
|
||||||
|
Windows = { kernel = kernels.windows; };
|
||||||
|
Cygwin = { kernel = kernels.windows; abi = abis.cygnus; };
|
||||||
|
MinGW = { kernel = kernels.windows; abi = abis.gnu; };
|
||||||
|
|
||||||
|
Arm32 = recursiveUpdate patterns.Arm patterns."32bit";
|
||||||
|
Arm64 = recursiveUpdate patterns.Arm patterns."64bit";
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
predicates = mapAttrs'
|
||||||
|
(name: value: nameValuePair ("is" + name) (matchAttrs value))
|
||||||
|
patterns;
|
||||||
|
}
|
|
@ -8,6 +8,7 @@
|
||||||
with import ../lists.nix;
|
with import ../lists.nix;
|
||||||
with import ../types.nix;
|
with import ../types.nix;
|
||||||
with import ../attrsets.nix;
|
with import ../attrsets.nix;
|
||||||
|
with (import ./inspect.nix).predicates;
|
||||||
|
|
||||||
let
|
let
|
||||||
lib = import ../default.nix;
|
lib = import ../default.nix;
|
||||||
|
@ -109,19 +110,6 @@ rec {
|
||||||
inherit cpu vendor kernel abi;
|
inherit cpu vendor kernel abi;
|
||||||
};
|
};
|
||||||
|
|
||||||
is64Bit = matchAttrs { cpu = { bits = 64; }; };
|
|
||||||
is32Bit = matchAttrs { cpu = { bits = 32; }; };
|
|
||||||
isi686 = matchAttrs { cpu = cpuTypes.i686; };
|
|
||||||
isx86_64 = matchAttrs { cpu = cpuTypes.x86_64; };
|
|
||||||
|
|
||||||
isDarwin = matchAttrs { kernel = kernels.darwin; };
|
|
||||||
isLinux = matchAttrs { kernel = kernels.linux; };
|
|
||||||
isUnix = matchAttrs { kernel = { families = { inherit (kernelFamilies) unix; }; }; };
|
|
||||||
isWindows = matchAttrs { kernel = kernels.windows; };
|
|
||||||
isCygwin = matchAttrs { kernel = kernels.windows; abi = abis.cygnus; };
|
|
||||||
isMinGW = matchAttrs { kernel = kernels.windows; abi = abis.gnu; };
|
|
||||||
|
|
||||||
|
|
||||||
mkSkeletonFromList = l: {
|
mkSkeletonFromList = l: {
|
||||||
"2" = # We only do 2-part hacks for things Nix already supports
|
"2" = # We only do 2-part hacks for things Nix already supports
|
||||||
if elemAt l 1 == "cygwin"
|
if elemAt l 1 == "cygwin"
|
||||||
|
@ -153,22 +141,22 @@ rec {
|
||||||
getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}");
|
getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}");
|
||||||
getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}");
|
getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}");
|
||||||
|
|
||||||
system = rec {
|
parsed = rec {
|
||||||
cpu = getCpu args.cpu;
|
cpu = getCpu args.cpu;
|
||||||
vendor =
|
vendor =
|
||||||
/**/ if args ? vendor then getVendor args.vendor
|
/**/ if args ? vendor then getVendor args.vendor
|
||||||
else if isDarwin system then vendors.apple
|
else if isDarwin parsed then vendors.apple
|
||||||
else if isWindows system then vendors.pc
|
else if isWindows parsed then vendors.pc
|
||||||
else vendors.unknown;
|
else vendors.unknown;
|
||||||
kernel = getKernel args.kernel;
|
kernel = getKernel args.kernel;
|
||||||
abi =
|
abi =
|
||||||
/**/ if args ? abi then getAbi args.abi
|
/**/ if args ? abi then getAbi args.abi
|
||||||
else if isLinux system then abis.gnu
|
else if isLinux parsed then abis.gnu
|
||||||
else if isWindows system then abis.gnu
|
else if isWindows parsed then abis.gnu
|
||||||
else abis.unknown;
|
else abis.unknown;
|
||||||
};
|
};
|
||||||
|
|
||||||
in mkSystem system;
|
in mkSystem parsed;
|
||||||
|
|
||||||
mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
|
mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
|
||||||
|
|
||||||
|
|
|
@ -5,17 +5,15 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (stdenv.lib.systems.parse) isDarwin;
|
|
||||||
|
|
||||||
prefix = stdenv.lib.optionalString
|
prefix = stdenv.lib.optionalString
|
||||||
(targetPlatform != hostPlatform)
|
(targetPlatform != hostPlatform)
|
||||||
"${targetPlatform.config}-";
|
"${targetPlatform.config}-";
|
||||||
in
|
in
|
||||||
|
|
||||||
assert isDarwin targetPlatform.parsed;
|
assert targetPlatform.isDarwin;
|
||||||
|
|
||||||
# Non-Darwin alternatives
|
# Non-Darwin alternatives
|
||||||
assert (!isDarwin hostPlatform.parsed) -> (maloader != null && xctoolchain != null);
|
assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null);
|
||||||
|
|
||||||
let
|
let
|
||||||
baseParams = rec {
|
baseParams = rec {
|
||||||
|
@ -91,7 +89,7 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall =
|
postInstall =
|
||||||
if isDarwin hostPlatform.parsed
|
if hostPlatform.isDarwin
|
||||||
then ''
|
then ''
|
||||||
cat >$out/bin/dsymutil << EOF
|
cat >$out/bin/dsymutil << EOF
|
||||||
#!${stdenv.shell}
|
#!${stdenv.shell}
|
||||||
|
|
|
@ -6397,7 +6397,7 @@ with pkgs;
|
||||||
bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };
|
bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };
|
||||||
|
|
||||||
binutils =
|
binutils =
|
||||||
if lib.systems.parse.isDarwin targetPlatform.parsed
|
if targetPlatform.isDarwin
|
||||||
then darwin.binutils
|
then darwin.binutils
|
||||||
else binutils-raw;
|
else binutils-raw;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue