about summary refs log tree commit diff
path: root/pkgs/development/web
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2015-04-25 16:21:51 +0200
committerJaka Hudoklin <jakahudoklin@gmail.com>2015-04-25 16:21:51 +0200
commit5e2b429e825102ce9ad87efd31a8dda76636f310 (patch)
tree815570c1898d3ed98a68eca5ddfc2020847168e8 /pkgs/development/web
parent95a8ecfd48abf6eee62126480b0e1063b5e9b17c (diff)
parent744b06cc28ad545f0dfd3e66ff73667c31a19eb6 (diff)
downloadnixlib-5e2b429e825102ce9ad87efd31a8dda76636f310.tar
nixlib-5e2b429e825102ce9ad87efd31a8dda76636f310.tar.gz
nixlib-5e2b429e825102ce9ad87efd31a8dda76636f310.tar.bz2
nixlib-5e2b429e825102ce9ad87efd31a8dda76636f310.tar.lz
nixlib-5e2b429e825102ce9ad87efd31a8dda76636f310.tar.xz
nixlib-5e2b429e825102ce9ad87efd31a8dda76636f310.tar.zst
nixlib-5e2b429e825102ce9ad87efd31a8dda76636f310.zip
Merge pull request #7556 from offlinehacker/pkgs/node-packages/fix_platforms
nodePackages: fix platform detection
Diffstat (limited to 'pkgs/development/web')
-rw-r--r--pkgs/development/web/nodejs/build-node-package.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 042e29f29705..679716d33c70 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -64,7 +64,7 @@ let
             stdenv.lib.platforms.${removePrefix "!" entry} or [];
         in
           # Ignore unknown platforms
-          if filterPlatforms == [] then platforms
+          if filterPlatforms == [] then (if platforms == [] then nodejs.meta.platforms else platforms)
           else
             if hasPrefix "!" entry then
               subtractLists (intersectLists filterPlatforms nodejs.meta.platforms) platforms