diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-04-04 18:56:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 18:56:16 +0200 |
commit | 6423bdf98039460a30c2b371d0c28c5eae04794d (patch) | |
tree | 225f4c743521cb9e69a6dd2695cd825bbb64bb41 /pkgs | |
parent | 15f31cafb0ae6739792e111b86282a987ef55f3b (diff) | |
parent | 592ce9d930549eb7dc2ba56bd3f64347bf0f7082 (diff) | |
download | nixpkgs-6423bdf98039460a30c2b371d0c28c5eae04794d.tar nixpkgs-6423bdf98039460a30c2b371d0c28c5eae04794d.tar.gz nixpkgs-6423bdf98039460a30c2b371d0c28c5eae04794d.tar.bz2 nixpkgs-6423bdf98039460a30c2b371d0c28c5eae04794d.tar.lz nixpkgs-6423bdf98039460a30c2b371d0c28c5eae04794d.tar.xz nixpkgs-6423bdf98039460a30c2b371d0c28c5eae04794d.tar.zst nixpkgs-6423bdf98039460a30c2b371d0c28c5eae04794d.zip |
Merge pull request #38337 from periklis/ngrok-darwin-build
ngrok: enable darwin build
Diffstat (limited to 'pkgs')
-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 031161da4d5..23725fb2d87 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 ]; }; } |