diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix | 49 |
1 files changed, 39 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix b/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix index 917274338a2e..9073cc9897e7 100644 --- a/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix @@ -1,23 +1,48 @@ -{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, dbus }: +{ stdenv +, lib +, fetchurl +, dpkg +, autoPatchelfHook +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, dbus +, nftables +}: stdenv.mkDerivation rec { pname = "cloudflare-warp"; - version = "2022.02.24"; + version = "2023.3.398"; src = fetchurl { - url = "https://pkg.cloudflareclient.com/uploads/cloudflare_warp_2022_2_288_1_amd64_a0be7b47b3.deb"; - sha256 = "sha256-gBXF0EfFMT6BC6ts/6PQYJH3AAQSDsFoZGK3RZIqmOA="; + url = "https://pkg.cloudflareclient.com/uploads/cloudflare_warp_2023_3_398_1_amd64_002e48d521.deb"; + hash = "sha256-1var+/G3WwICRLXsMHke277tmPYRPFW8Yf9b1Ex9OmU="; }; nativeBuildInputs = [ dpkg autoPatchelfHook + makeWrapper + copyDesktopItems ]; - buildInputs = [ dbus ]; + buildInputs = [ + dbus + stdenv.cc.cc.lib + ]; - dontBuild = true; - dontConfigure = true; + desktopItems = [ + (makeDesktopItem { + name = "com.cloudflare.WarpCli"; + desktopName = "Cloudflare Zero Trust Team Enrollment"; + categories = [ "Utility" "Security" "ConsoleOnly" ]; + noDisplay = true; + mimeTypes = [ "x-scheme-handler/com.cloudflare.warp" ]; + exec = "warp-cli teams-enroll-token %u"; + startupNotify = false; + terminal = true; + }) + ]; unpackPhase = '' dpkg-deb -x ${src} ./ @@ -27,15 +52,19 @@ stdenv.mkDerivation rec { runHook preInstall mv usr $out - mv lib $out mv bin $out + mv etc $out + mv lib/systemd/system $out/lib/systemd/ + substituteInPlace $out/lib/systemd/system/warp-svc.service \ + --replace "ExecStart=" "ExecStart=$out" + substituteInPlace $out/lib/systemd/user/warp-taskbar.service \ + --replace "ExecStart=" "ExecStart=$out" runHook postInstall ''; postInstall = '' - substituteInPlace $out/lib/systemd/system/warp-svc.service \ - --replace "ExecStart=" "ExecStart=$out" + wrapProgram $out/bin/warp-svc --prefix PATH : ${lib.makeBinPath [ nftables ]} ''; meta = with lib; { |