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

Merge pull request #53042 from exi/wireguard 

wireguard-tools Add proper dependencies
This commit is contained in:
Maximilian Bosch 2018-12-29 22:57:25 +01:00 committed by GitHub
parent 5b0c2b9d00 ca9e76e676
commit 693aee0218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/wireguard-tools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, libmnl ? null, makeWrapper ? null, wireguard-go ? null }: { stdenv, fetchzip, openresolv ? null, libmnl ? null, procps ? null, iproute ? null, makeWrapper ? null, wireguard-go ? null }:
with stdenv.lib; with stdenv.lib;
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sourceRoot = "source/src/tools"; sourceRoot = "source/src/tools";
nativeBuildInputs = optional stdenv.isDarwin makeWrapper; nativeBuildInputs = [ makeWrapper ];
buildInputs = optional stdenv.isLinux libmnl; buildInputs = optional stdenv.isLinux libmnl;
makeFlags = [ makeFlags = [
@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \ substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin --replace /usr/bin $out/bin
'' + optionalString stdenv.isLinux ''
for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute openresolv]}
done
'' + optionalString stdenv.isDarwin '' '' + optionalString stdenv.isDarwin ''
for f in $out/bin/*; do for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${wireguard-go}/bin wrapProgram $f --prefix PATH : ${wireguard-go}/bin