wireguard-tools: remove ? null from inputs, remove with lib;
This commit is contained in:
parent
ec5be00b37
commit
a71af661d3
1 changed files with 12 additions and 13 deletions
|
@ -1,16 +1,15 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, nixosTests
|
||||
, iptables ? null
|
||||
, iproute ? null
|
||||
, makeWrapper ? null
|
||||
, openresolv ? null
|
||||
, procps ? null
|
||||
, wireguard-go ? null
|
||||
, iptables
|
||||
, iproute
|
||||
, makeWrapper
|
||||
, openresolv
|
||||
, procps
|
||||
, wireguard-go
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireguard-tools";
|
||||
version = "1.0.20210315";
|
||||
|
@ -37,11 +36,11 @@ stdenv.mkDerivation rec {
|
|||
postFixup = ''
|
||||
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
|
||||
--replace /usr/bin $out/bin
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute iptables openresolv]}
|
||||
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]}
|
||||
done
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f --prefix PATH : ${wireguard-go}/bin
|
||||
done
|
||||
|
@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
tests = nixosTests.wireguard;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Tools for the WireGuard secure network tunnel";
|
||||
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
|
||||
homepage = "https://www.wireguard.com/";
|
||||
|
|
Loading…
Reference in a new issue