diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-22 14:07:06 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-22 14:07:06 -0800 |
| commit | 0bc275e63423456d6deb650e146120c39c1e0723 (patch) | |
| tree | 1d33aa707b24fa58952162457e243c731836f99b /pkgs/development/tools | |
| parent | 2e5475381b65290e08d357fa1434bd28d0c21cfa (diff) | |
| download | nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.gz nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.bz2 nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.lz nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.xz nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.zst nixlib-0bc275e63423456d6deb650e146120c39c1e0723.zip | |
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged into master This reverts commit 8929989614589ee3acd070a6409b2b9700c92d65.
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 edf556377b33..e333bd497184 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.hostPlatform.linuxArch}" - || x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}" - || x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}" + x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" || 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 ea2f27b0e227..ba8145398f5d 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.hostPlatform.linuxArch; + platform_machine = stdenv.platform.kernelArch; platform_python_implementation = let impl = python.passthru.implementation; |