diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-12-12 18:55:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 18:55:23 -0500 |
| commit | e5629dc51a313c3b99725616718d2deff49cd891 (patch) | |
| tree | db8c9beb70833b2503e8c9da305dc3ac0294f8fe /pkgs/applications/networking | |
| parent | 3cad1abf9e5e8a4e0b38270b1d7c7cd89a97e92b (diff) | |
| parent | f33a513d2b1f07da28549ffb7067f913bb3e302a (diff) | |
| download | nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.gz nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.bz2 nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.lz nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.xz nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.zst nixlib-e5629dc51a313c3b99725616718d2deff49cd891.zip | |
Merge pull request #32365 from vcunat/p/check-meta
check meta, treewide
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix index 3fa7fe180402..eb988471c8c7 100644 --- a/pkgs/applications/networking/bittorrentsync/generic.nix +++ b/pkgs/applications/networking/bittorrentsync/generic.nix @@ -4,8 +4,9 @@ let arch = { "x86_64-linux" = "x64"; "i686-linux" = "i386"; - }.${stdenv.system}; + }.${stdenv.system} or throwSystem; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; + throwSystem = throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz" "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz" ]; - sha256 = sha256s.${stdenv.system}; + sha256 = sha256s.${stdenv.system} or throwSystem; }; dontStrip = true; # Don't strip, otherwise patching the rpaths breaks diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index d002b51625c6..4ff649dbf2a0 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -4,7 +4,7 @@ let ld32 = if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" - else abort "Unsupported architecture"; + else throw "Unsupported system ${stdenv.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 7622cb76ad2a..5e94106a48f1 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -4,7 +4,7 @@ let arch = { "x86_64-linux" = "x64"; "i686-linux" = "i386"; - }.${stdenv.system}; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { |