Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b13ffa2aef62
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 404041b20b4d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 23, 2020

  1. wireguard-go: fix executable name 

    It's supposed to be `wireguard-go` instead of `wireguard`. Upstream does
this right in their Makefile, however we use our own build-script which
creates a wrong file in $out, so it has to be fixed in the
`postInstall`-hook.

Closes #88567

(cherry picked from commit 0f65693)
    @Ma27
    Ma27 committed May 23, 2020
    Copy the full SHA
    88b9351 View commit details

  2. wireguard-go: keep $bin/bin/wireguard for backwards-compat 

    As proposed in NixOS/nixpkgs#88610 (comment)
    @Ma27
    Ma27 committed May 23, 2020
    Copy the full SHA
    404041b View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/tools/networking/wireguard-go/default.nix
4 changes: 4 additions & 0 deletions pkgs/tools/networking/wireguard-go/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,10 @@ buildGoPackage rec {

passthru.updateScript = ./update.sh;

postInstall = ''
ln -sf $bin/bin/wireguard $bin/bin/wireguard-go
'';

meta = with stdenv.lib; {
description = "Userspace Go implementation of WireGuard";
homepage = https://git.zx2c4.com/wireguard-go/about/;