summary refs log tree commit diff
path: root/pkgs/tools/networking/ngrok-2/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-01-07 23:51:27 +0000
committerAlyssa Ross <hi@alyssa.is>2020-01-08 00:25:04 +0000
commit096ca241d9505c265fe46cacec7b316eecb401ad (patch)
tree1c4f5daadf7a0f2544ef9b1d219ddcca6867df0d /pkgs/tools/networking/ngrok-2/default.nix
parent1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (diff)
parent5f6df74f66246a2eb198b0bc3fe1f7d2dff57062 (diff)
downloadnixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar
nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.gz
nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.bz2
nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.lz
nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.xz
nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.zst
nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.zip
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/tools/networking/ngrok-2/default.nix')
-rw-r--r--pkgs/tools/networking/ngrok-2/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix
index cc5620a1f4d..a0d6171efe2 100644
--- a/pkgs/tools/networking/ngrok-2/default.nix
+++ b/pkgs/tools/networking/ngrok-2/default.nix
@@ -5,8 +5,8 @@ with stdenv.lib;
 let versions = builtins.fromJSON (builtins.readFile ./versions.json);
     arch = if stdenv.isi686 then "386"
            else if stdenv.isx86_64 then "amd64"
+           else if stdenv.isAarch32 then "arm"
            else if stdenv.isAarch64 then "arm64"
-           else if stdenv.isArm then "arm"
            else throw "Unsupported architecture";
     os = if stdenv.isLinux then "linux"
          else if stdenv.isDarwin then "darwin"