diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-05 19:25:05 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-05 19:25:05 +0200 |
commit | a9f37d1c250ebef05fa81909b2583642d23811b7 (patch) | |
tree | 451ccefd892e66700ec831b31505cc4b9a80bff4 /pkgs/tools/networking | |
parent | a137be55907a0e083a192ee56b7f6f0a6369ab02 (diff) | |
parent | c45eadf31ddf61328a33dc9215c4b1f1f4f2c0d2 (diff) | |
download | nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.gz nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.bz2 nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.lz nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.xz nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.zst nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.zip |
Merge master into staging
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/ngrok-2/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 031161da4d57..23725fb2d874 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -1,31 +1,38 @@ { stdenv, fetchurl, unzip }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "ngrok-${version}"; version = "2.2.8"; - src = if stdenv.system == "i686-linux" then fetchurl { + src = if stdenv.isLinux && stdenv.isi686 then fetchurl { url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-i386.tgz"; sha256 = "0s5ymlaxrvm13q3mlvfirh74sx60qh56c5sgdma2r7q5qlsq41xg"; - } else if stdenv.system == "x86_64-linux" then fetchurl { + } else if stdenv.isLinux && stdenv.isx86_64 then fetchurl { url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.tgz"; sha256 = "1mn9iwgy6xzrjihikwc2k2j59igqmph0cwx17qp0ziap9lp5xxad"; + } else if stdenv.isDarwin then fetchurl { + url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-darwin-386.zip"; + sha256 = "0yfd250b55wcpgqd00rqfaa7a82f35fmybb31q5xwdbgc2i47pbh"; } else throw "platform ${stdenv.system} not supported!"; sourceRoot = "."; + nativeBuildInputs = optional stdenv.isDarwin unzip; + installPhase = '' install -D ngrok $out/bin/ngrok ''; - meta = with stdenv.lib; { + meta = { description = "ngrok"; longDescription = '' Allows you to expose a web server running on your local machine to the internet. ''; homepage = https://ngrok.com/; - license = stdenv.lib.licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bobvanderlinden ]; }; } |