diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:37:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:38:18 +0200 |
| commit | 2d6179d1e8c15d341f0cade0ab55653623eb5038 (patch) | |
| tree | d69260a6e740c174c9616b2bb6d24a0e98ba8f6e /pkgs/tools/misc/bandwidth/default.nix | |
| parent | 2e7cb61cfbe6df23a2e223f98ae61e1a385ea747 (diff) | |
| parent | 9a56eee0b144c1e63afc0b5c9e562da9565ea7f0 (diff) | |
| download | nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.gz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.bz2 nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.lz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.xz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.zst nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.zip | |
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
Diffstat (limited to 'pkgs/tools/misc/bandwidth/default.nix')
| -rw-r--r-- | pkgs/tools/misc/bandwidth/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index e8ea9117bc5a..e50faaca8995 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -2,11 +2,11 @@ let arch = - if stdenv.system == "x86_64-linux" then "bandwidth64" - else if stdenv.system == "i686-linux" then "bandwidth32" - else if stdenv.system == "x86_64-darwin" then "bandwidth-mac64" - else if stdenv.system == "i686-darwin" then "bandwidth-mac32" - else if stdenv.system == "i686-cygwin" then "bandwidth-win32" + if stdenv.hostPlatform.system == "x86_64-linux" then "bandwidth64" + else if stdenv.hostPlatform.system == "i686-linux" then "bandwidth32" + else if stdenv.hostPlatform.system == "x86_64-darwin" then "bandwidth-mac64" + else if stdenv.hostPlatform.system == "i686-darwin" then "bandwidth-mac32" + else if stdenv.hostPlatform.system == "i686-cygwin" then "bandwidth-win32" else throw "Unknown architecture"; in stdenv.mkDerivation rec { |