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: 7ee6c6ad6d23
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 069188467c57
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 5, 2020

  1. wireguard-go: fix darwin build 

    https://hydra.nixos.org/build/109407984
    @Ma27
    Ma27 committed Jan 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    GPG key ID: D57EFA625C9A925F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0691884 View commit details
Showing with 28 additions and 0 deletions.
  1. +26 −0 pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch
  2. +2 −0 pkgs/tools/networking/wireguard-go/default.nix
26 changes: 26 additions & 0 deletions pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 63360467da4ae6d7fc8c0e05619bdf8813c7e417 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 5 Jan 2020 15:35:15 +0100
Subject: [PATCH] Fix darwin build

---
rwcancel/select_default.go | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go
index dd23cda..03f3452 100644
--- a/rwcancel/select_default.go
+++ b/rwcancel/select_default.go
@@ -9,6 +9,7 @@ package rwcancel

import "golang.org/x/sys/unix"

-func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error {
- return unix.Select(nfd, r, w, e, timeout)
+func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) {
+ _, err = unix.Select(nfd, r, w, e, timeout)
+ return
}
--
2.23.1

2 changes: 2 additions & 0 deletions pkgs/tools/networking/wireguard-go/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@ buildGoPackage rec {
sha256 = "0s3hvqpz13n630yvi0476hfzrp3xcj8x61zc2hl5z70f8kvbay4i";
};

patches = [ ./0001-Fix-darwin-build.patch ];

goDeps = ./deps.nix;

passthru.updateScript = ./update.sh;