colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40744 from kirelagin/wireguard-darwin

Browse Source 
WireGuard: Make tools available on other platforms
This commit is contained in:
Jörg Thalheim 2018-05-19 22:49:54 +01:00 committed by GitHub
commit 8bcec815bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 73 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/networking/wireguard.nix
View File

@ -193,7 +193,7 @@ let
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment.DEVICE = name;
path = with pkgs; [ kmod iproute wireguard ];
path = with pkgs; [ kmod iproute wireguard-tools ];
serviceConfig = {
Type = "oneshot";
@ -279,7 +279,7 @@ in
config = mkIf (cfg.interfaces != {}) {
boot.extraModulePackages = [ kernel.wireguard ];
environment.systemPackages = [ pkgs.wireguard ];
environment.systemPackages = [ pkgs.wireguard-tools ];
systemd.services = mapAttrs' generateUnit cfg.interfaces;

81
pkgs/os-specific/linux/wireguard/default.nix
View File

@ -1,73 +1,36 @@
{ stdenv, fetchurl, libmnl, kernel ? null }:
{ stdenv, fetchzip, kernel, wireguard-tools }:
# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
assert stdenv.lib.versionAtLeast kernel.version "3.10";
let
stdenv.mkDerivation rec {
name = "wireguard-${version}";
version = "0.0.20180514";
src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
};
inherit (wireguard-tools) src;
preConfigure = ''
cd src
sed -i '/depmod/,+1d' Makefile
'';
hardeningDisable = [ "pic" ];
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
INSTALL_MOD_PATH = "\${out}";
NIX_CFLAGS = ["-Wno-error=cpp"];
nativeBuildInputs = kernel.moduleBuildDependencies;
buildPhase = "make module";
meta = with stdenv.lib; {
homepage = https://www.wireguard.com/;
downloadPage = https://git.zx2c4.com/WireGuard/refs/;
description = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security";
description = " Tools for the WireGuard secure network tunnel";
maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ];
license = licenses.gpl2;
platforms = platforms.linux;
};
module = stdenv.mkDerivation {
inherit src meta name;
preConfigure = ''
cd src
sed -i '/depmod/,+1d' Makefile
'';
hardeningDisable = [ "pic" ];
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
INSTALL_MOD_PATH = "\${out}";
NIX_CFLAGS = ["-Wno-error=cpp"];
nativeBuildInputs = kernel.moduleBuildDependencies;
buildPhase = "make module";
};
tools = stdenv.mkDerivation {
inherit src meta name;
preConfigure = "cd src";
buildInputs = [ libmnl ];
enableParallelBuilding = true;
makeFlags = [
"WITH_BASHCOMPLETION=yes"
"WITH_WGQUICK=yes"
"WITH_SYSTEMDUNITS=yes"
"DESTDIR=$(out)"
"PREFIX=/"
"-C" "tools"
];
buildPhase = "make tools";
postInstall = ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
'';
};
in if kernel == null
then tools
else module
}

46
pkgs/tools/networking/wireguard-tools/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, lib, fetchzip, libmnl, useSystemd ? stdenv.isLinux }:
let
inherit (lib) optional optionalString;
in
stdenv.mkDerivation rec {
name = "wireguard-tools-${version}";
version = "0.0.20180514";
src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
};
preConfigure = "cd src";
buildInputs = optional stdenv.isLinux libmnl;
enableParallelBuilding = true;
makeFlags = [
"WITH_BASHCOMPLETION=yes"
"WITH_WGQUICK=yes"
"WITH_SYSTEMDUNITS=${if useSystemd then "yes" else "no"}"
"DESTDIR=$(out)"
"PREFIX=/"
"-C" "tools"
];
buildPhase = "make tools";
postInstall = optionalString useSystemd ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
'';
meta = with stdenv.lib; {
homepage = https://www.wireguard.com/;
downloadPage = https://git.zx2c4.com/WireGuard/refs/;
description = " Tools for the WireGuard secure network tunnel";
maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ];
license = licenses.gpl2;
platforms = platforms.unix;
};
}

1
pkgs/top-level/aliases.nix
View File

@ -228,6 +228,7 @@ mapAliases (rec {
vorbisTools = vorbis-tools; # added 2016-01-26
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
wireguard = wireguard-tools; # added 2018-05-19
x11 = xlibsWrapper; # added 2015-09
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
xlibs = xorg; # added 2015-09

4
pkgs/top-level/all-packages.nix
View File

@ -5511,6 +5511,8 @@ with pkgs;
whois = callPackage ../tools/networking/whois { };
wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
woff2 = callPackage ../development/web/woff2 { };
woof = callPackage ../tools/misc/woof { };
@ -18557,8 +18559,6 @@ with pkgs;
erlang = erlangR18;
};
wireguard = callPackage ../os-specific/linux/wireguard { };
alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
wllvm = callPackage ../development/tools/wllvm { };