From 86f0874b38c7e7706ab3f7a98d796d10ee7c964a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Sep 2023 10:43:22 +0200 Subject: [PATCH 1/3] ubridge: enable darwin support --- pkgs/tools/networking/ubridge/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index ac475e6e8a53..ba8f220bbde3 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -21,8 +21,13 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; - preInstall = '' + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -Dm755 ubridge $out/bin/ubridge + + runHook postInstall ''; meta = with lib; { @@ -35,7 +40,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}"; license = licenses.gpl3Plus; - platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux ++ platforms.darwin; }; } From 5c05b25c9c931c1114e55e82b07e9cd02280746a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Sep 2023 10:43:15 +0200 Subject: [PATCH 2/3] ubridge: add passthru.tests.version --- pkgs/tools/networking/ubridge/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index ba8f220bbde3..e7e48de1b782 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , libpcap +, testers +, ubridge }: stdenv.mkDerivation rec { @@ -30,6 +34,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + tests.version = testers.testVersion { + package = ubridge; + command = "ubridge -v"; + }; + }; + meta = with lib; { description = "Bridge for UDP tunnels, Ethernet, TAP, and VMnet interfaces"; longDescription = '' From 1a3b8dc96300648a27ed5df4e647a1b784e012b9 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Sep 2023 10:45:12 +0200 Subject: [PATCH 3/3] ubridge: add meta.mainProgram --- pkgs/tools/networking/ubridge/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index e7e48de1b782..085ee4f76d0a 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}"; license = licenses.gpl3Plus; + mainProgram = "ubridge"; maintainers = with maintainers; [ primeos ]; platforms = platforms.linux ++ platforms.darwin; };