diff options
author | Chuck <chuck@intelligence.org> | 2020-02-05 10:21:35 -0800 |
---|---|---|
committer | Chuck <chuck@intelligence.org> | 2020-02-05 10:56:06 -0800 |
commit | 9333e47b28d9da0d20479b7722ee4de195848bed (patch) | |
tree | 9e50d666f366ad79b772d4e9f3d78ce010d5d4a1 | |
parent | 0be87c79797a5fa384fbc356c74ed54f9f7829ea (diff) | |
download | nixpkgs-9333e47b28d9da0d20479b7722ee4de195848bed.tar nixpkgs-9333e47b28d9da0d20479b7722ee4de195848bed.tar.gz nixpkgs-9333e47b28d9da0d20479b7722ee4de195848bed.tar.bz2 nixpkgs-9333e47b28d9da0d20479b7722ee4de195848bed.tar.lz nixpkgs-9333e47b28d9da0d20479b7722ee4de195848bed.tar.xz nixpkgs-9333e47b28d9da0d20479b7722ee4de195848bed.tar.zst nixpkgs-9333e47b28d9da0d20479b7722ee4de195848bed.zip |
nodejs: isArm -> isAarch32
This is the last package reference to isArm. isArm is deprecated after 18.03. This substitution was performed tree-wide in #37401.
-rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index ea23ad06cd2..dce8479d219 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -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; |