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

Merge pull request #79291 from chkno/remove-isArm

Browse Source 
Remove isArm
This commit is contained in:
worldofpeace
2020-02-08 09:57:30 -05:00
committed by GitHub
parent 4befcf4c6e 5d4821141b
commit 1193468f13
4 changed files with 5 additions and 11 deletions
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
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
host = stdenv.hostPlatform.platform;
isArm = stdenv.hostPlatform.isArm;
isAarch32 = stdenv.hostPlatform.isAarch32;
in sharedConfigureFlags ++ [
"--without-dtrace"
] ++ (optionals isCross [
"--cross-compiling"
"--without-intl"
"--without-snapshot"
]) ++ (optionals (isCross && isArm && hasAttr "fpu" host.gcc) [
]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
"--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}"
]) ++ (optionals (isCross && isArm) [
]) ++ (optionals (isCross && isAarch32) [
"--dest-cpu=arm"
]) ++ extraConfigFlags;