diff options
| author | John Ericson <git@JohnEricson.me> | 2021-01-23 16:32:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-23 16:32:36 -0500 |
| commit | 12881a7aa703beb3fbf2b26f8cfd76e9bd67ae6b (patch) | |
| tree | db1aa4bc8b04bbcd14e549020e3cfc4546356446 /pkgs/development/web/nodejs/nodejs.nix | |
| parent | 10bb07207285db91a5733078e1f84ba4d8ef5b78 (diff) | |
| parent | 2dde58903e0f2f490088c3b0cedadc9b479da085 (diff) | |
Merge pull request #110544 from Ericson2314/no-platform
top-level, lib: Remove platform attribute of platforms
Diffstat (limited to 'pkgs/development/web/nodejs/nodejs.nix')
| -rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 9cd21b0cb3494..1af4024400a05 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -60,18 +60,17 @@ in configureFlags = let isCross = stdenv.hostPlatform != stdenv.buildPlatform; - host = stdenv.hostPlatform.platform; - isAarch32 = stdenv.hostPlatform.isAarch32; + inherit (stdenv.hostPlatform) gcc isArch32; in sharedConfigureFlags ++ [ "--without-dtrace" ] ++ (optionals isCross [ "--cross-compiling" "--without-intl" "--without-snapshot" - ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [ - "--with-arm-fpu=${host.gcc.fpu}" - ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [ - "--with-arm-float-abi=${host.gcc.float-abi}" + ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [ + "--with-arm-fpu=${gcc.fpu}" + ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [ + "--with-arm-float-abi=${gcc.float-abi}" ]) ++ (optionals (isCross && isAarch32) [ "--dest-cpu=arm" ]) ++ extraConfigFlags; |