diff options
| author | Artturi <Artturin@artturin.com> | 2021-12-04 01:41:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-04 01:41:16 +0200 |
| commit | 0815c6542e1115932d8d4548ee1bc0c2a2b5b042 (patch) | |
| tree | 6ea3794bb4a09f2fde6be2220e46349ac836fe3b | |
| parent | agate: fix meta (diff) | |
| parent | globalprotect-openconnect: use ver rev instead of commit & correct sha256 (diff) | |
| download | nixpkgs-0815c6542e1115932d8d4548ee1bc0c2a2b5b042.tar.gz | |
Merge pull request #148527 from NixOS/backport-148381-to-release-21.11
[Backport release-21.11] globalprotect-openconnect: use ver rev instead of commit & correct sh…
| -rw-r--r-- | pkgs/tools/networking/globalprotect-openconnect/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index 34fd3ef081f9..f4b0607d49fb 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, qmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect +, cmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect }: stdenv.mkDerivation rec { @@ -9,26 +9,16 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "yuezk"; repo = "GlobalProtect-openconnect"; - rev = "c14a6ad1d2b62f8d297bc4cfbcb1dcea4d99112f"; fetchSubmodules = true; - sha256 = "sha256-M3+YGdN7LuuFEP9n94YJ/UDVhti/VlX0FzYMGeYebP4="; + rev = "v${version}"; + sha256 = "sha256-w2y6DOFgQ8Xpi1abibvRNpEUbBsdvwDMGqlJxQSCpVg="; }; - nativeBuildInputs = [ qmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ openconnect qtwebsockets qtwebengine ]; patchPhase = '' - for f in GPClient/GPClient.pro \ - GPClient/com.yuezk.qt.gpclient.desktop \ - GPService/GPService.pro \ - GPService/dbus/com.yuezk.qt.GPService.service \ - GPService/systemd/gpservice.service; do - substituteInPlace $f \ - --replace /usr $out \ - --replace /etc $out/lib; - done; - substituteInPlace GPService/gpservice.h \ --replace /usr/local/bin/openconnect ${openconnect}/bin/openconnect; ''; |