Merge pull request #208333 from urandom2/wgnord

Fixes https://github.com/NixOS/nixpkgs/issues/201573
This commit is contained in:
Sandro 2023-01-27 00:15:10 +01:00 committed by GitHub
commit 5912f2cdfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 0 deletions

View File

@ -0,0 +1,65 @@
{ bash
, coreutils
, curl
, fetchFromGitHub
, gnugrep
, gnused
, iproute2
, jq
, lib
, resholve
, wireguard-tools
}:
resholve.mkDerivation rec {
pname = "wgnord";
version = "0.1.10";
src = fetchFromGitHub {
owner = "phirecc";
repo = pname;
rev = version;
hash = "sha256-T7dAEgi4tGvrzBABGLzKHhpCx0bxSCtTVI5iJJqJGlE=";
};
postPatch = ''
substituteInPlace wgnord \
--replace '$conf_dir/countries.txt' "$out/share/countries.txt" \
--replace '$conf_dir/countries_iso31662.txt' "$out/share/countries_iso31662.txt"
'';
dontBuild = true;
installPhase = ''
install -Dm 755 wgnord -t $out/bin/
install -Dm 644 countries.txt -t $out/share/
install -Dm 644 countries_iso31662.txt -t $out/share/
'';
solutions.default = {
scripts = [ "bin/wgnord" ];
interpreter = "${bash}/bin/sh";
inputs = [
coreutils
curl
gnugrep
gnused
iproute2
jq
wireguard-tools
];
fix.aliases = true; # curl command in an alias
execer = [
"cannot:${iproute2}/bin/ip"
"cannot:${wireguard-tools}/bin/wg-quick"
];
};
meta = with lib; {
description = "A NordVPN Wireguard (NordLynx) client in POSIX shell";
homepage = "https://github.com/phirecc/wgnord";
changelog = "https://github.com/phirecc/wgnord/releases/tag/v${version}";
maintainers = with lib.maintainers; [ urandom ];
license = licenses.mit;
};
}

View File

@ -33650,6 +33650,8 @@ with pkgs;
weston = callPackage ../applications/window-managers/weston { };
wgnord = callPackage ../applications/networking/wgnord/default.nix {};
whalebird = callPackage ../applications/misc/whalebird {
electron = electron_19;
};