diff options
| author | John Ericson <git@JohnEricson.me> | 2021-01-22 15:15:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 15:15:58 -0500 |
| commit | d95aebbe0e723cb3d275d68b8529f0891a23df96 (patch) | |
| tree | 53d25bb2d4fa366a5f74bacb5e71bda21e7823b6 /pkgs/development/tools | |
| parent | 412a9e7d7c8992d77e382f53b7eb1ebefb271735 (diff) | |
| parent | 8929989614589ee3acd070a6409b2b9700c92d65 (diff) | |
| download | nixlib-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar nixlib-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.gz nixlib-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.bz2 nixlib-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.lz nixlib-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.xz nixlib-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.zst nixlib-d95aebbe0e723cb3d275d68b8529f0891a23df96.zip | |
Merge pull request #107214 from Ericson2314/linux-config-cleanup
lib: Clean up how linux and gcc config is specified
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; |