diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2022-09-30 06:59:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-30 06:59:24 -0500 |
commit | ad01d304d56dcc740df77a386016b487455c9d11 (patch) | |
tree | 61d30e96b17452233bb03755dbbb6eb67b3aa30d | |
parent | f19adea8d452c658d63c87e951162d6705e428ed (diff) | |
parent | ca9da3a094fb6d40450e21511ec1afd1e9456916 (diff) |
Merge pull request #193060 from WolfangAukang/cloudflare-warp-update
cloudflare-warp: 2022.02.24 -> 2022.8.936
-rw-r--r-- | pkgs/tools/networking/cloudflare-warp/default.nix | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index 917274338a2e0..6094177712e55 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -1,24 +1,30 @@ -{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, dbus }: +{ stdenv +, lib +, fetchurl +, dpkg +, autoPatchelfHook +, makeWrapper +, dbus +, nftables +}: stdenv.mkDerivation rec { pname = "cloudflare-warp"; - version = "2022.02.24"; + version = "2022.8.936"; 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_2022_8_936_1_amd64_1923bb9dba.deb"; + sha256 = "sha256-ZuJyMl6g8KDwxc9UipH63naJ4dl/84Vhk7ini/VNPno="; }; nativeBuildInputs = [ dpkg autoPatchelfHook + makeWrapper ]; buildInputs = [ dbus ]; - dontBuild = true; - dontConfigure = true; - unpackPhase = '' dpkg-deb -x ${src} ./ ''; @@ -27,15 +33,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; { |