diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-11-29 00:01:14 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-21 22:44:09 -0500 |
commit | 8929989614589ee3acd070a6409b2b9700c92d65 (patch) | |
tree | 595f163bed2eda4b564fa19df7ed03e7679af00b /pkgs/development/tools | |
parent | 77403c1c19f9e9c5f8ba9bb24f83c07eace126b2 (diff) | |
download | nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.gz nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.bz2 nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.lz nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.xz nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.zst nixlib-8929989614589ee3acd070a6409b2b9700c92d65.zip |
lib: Clean up how linux and gcc config is specified
The `platform` field is pointless nesting: it's just stuff that happens to be defined together, and that should be an implementation detail. This instead makes `linux-kernel` and `gcc` top level fields in platform configs. They join `rustc` there [all are optional], which was put there and not in `platform` in anticipation of a change like this. `linux-kernel.arch` in particular also becomes `linuxArch`, to match the other `*Arch`es. The next step after is this to combine the *specific* machines from `lib.systems.platforms` with `lib.systems.examples`, keeping just the "multiplatform" ones for defaulting.
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index e333bd497184..edf556377b33 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -73,9 +73,9 @@ let if isLinux then ( - x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" + x: x.platform == "manylinux1_${stdenv.hostPlatform.linuxArch}" + || x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}" + || x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}" || x.platform == "any" ) else (x: hasInfix "macosx" x.platform || x.platform == "any"); diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index ba8145398f5d..ea2f27b0e227 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -95,7 +95,7 @@ let else if stdenv.isDarwin then "darwin" else throw "Unsupported platform" ); - platform_machine = stdenv.platform.kernelArch; + platform_machine = stdenv.hostPlatform.linuxArch; platform_python_implementation = let impl = python.passthru.implementation; |