Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 888e22cbd94f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5cd1e345075f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 22, 2018

  1. wireguard-tools: clean up, wrap w/ wireguard-go on Darwin

    @lukateras
    lukateras committed May 22, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    nbbeeken Neal Beeken
    GPG key ID: 22F3C38EA1A0C076
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e9e044a View commit details

  2. Merge pull request #40907 from yegortimoshenko/20180522.041617/wiregu… 

    …ard-tools-cleanup

wireguard-tools: clean up, wrap w/ wireguard-go on Darwin
    @lukateras
    lukateras authored May 22, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    nbbeeken Neal Beeken
    GPG key ID: 22F3C38EA1A0C076
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5cd1e34 View commit details
Showing with 19 additions and 21 deletions.
  1. +19 −21 pkgs/tools/networking/wireguard-tools/default.nix
40 changes: 19 additions & 21 deletions pkgs/tools/networking/wireguard-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,44 @@
{ stdenv, lib, fetchzip, libmnl, useSystemd ? stdenv.isLinux }:
{ stdenv, fetchzip, libmnl ? null, makeWrapper ? null, wireguard-go ? null }:

let
inherit (lib) optional optionalString;
in
with stdenv.lib;

stdenv.mkDerivation rec {
name = "wireguard-tools-${version}";
version = "0.0.20180519";

src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "0pd04ia0wcm0f6di4gx5kflccc5j35d72j38l8jqpj8vinl6l070";
};

preConfigure = "cd src";
sourceRoot = "source/src/tools";

buildInputs = optional stdenv.isLinux libmnl;

enableParallelBuilding = true;
nativeBuildInputs = [ (optional stdenv.isDarwin makeWrapper) ];
buildInputs = [ (optional stdenv.isLinux libmnl) ];

makeFlags = [
"WITH_BASHCOMPLETION=yes"
"WITH_WGQUICK=yes"
"WITH_SYSTEMDUNITS=${if useSystemd then "yes" else "no"}"
"DESTDIR=$(out)"
"PREFIX=/"
"-C" "tools"
"WITH_BASHCOMPLETION=yes"
"WITH_SYSTEMDUNITS=yes"
"WITH_WGQUICK=yes"
];

buildPhase = "make tools";

postInstall = optionalString useSystemd ''
postFixup = ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
'' + optionalString stdenv.isDarwin ''
for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${wireguard-go}/bin
done
'';

meta = with stdenv.lib; {
homepage = https://www.wireguard.com/;
description = "Tools for the WireGuard secure network tunnel";
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;
homepage = https://www.wireguard.com/;
license = licenses.gpl2;
maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ];
platforms = platforms.unix;
};
}