public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs: isArm -> isAarch32

Browse Source 
This is the last package reference to isArm.  isArm is deprecated after 18.03.
This substitution was performed tree-wide in #37401.
This commit is contained in:
Chuck 2020-02-05 10:21:35 -08:00
parent 0be87c7979
commit 9333e47b28
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/web/nodejs/nodejs.nix
View File

@ -61,18 +61,18 @@ in
configureFlags = let configureFlags = let
isCross = stdenv.hostPlatform != stdenv.buildPlatform; isCross = stdenv.hostPlatform != stdenv.buildPlatform;
host = stdenv.hostPlatform.platform; host = stdenv.hostPlatform.platform;
isArm = stdenv.hostPlatform.isArm; isAarch32 = stdenv.hostPlatform.isAarch32;
in sharedConfigureFlags ++ [ in sharedConfigureFlags ++ [
"--without-dtrace" "--without-dtrace"
] ++ (optionals isCross [ ] ++ (optionals isCross [
"--cross-compiling" "--cross-compiling"
"--without-intl" "--without-intl"
"--without-snapshot" "--without-snapshot"
]) ++ (optionals (isCross && isArm && hasAttr "fpu" host.gcc) [ ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
"--with-arm-fpu=${host.gcc.fpu}" "--with-arm-fpu=${host.gcc.fpu}"
]) ++ (optionals (isCross && isArm && hasAttr "float-abi" host.gcc) [ ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
"--with-arm-float-abi=${host.gcc.float-abi}" "--with-arm-float-abi=${host.gcc.float-abi}"
]) ++ (optionals (isCross && isArm) [ ]) ++ (optionals (isCross && isAarch32) [
"--dest-cpu=arm" "--dest-cpu=arm"
]) ++ extraConfigFlags; ]) ++ extraConfigFlags;