From a0d9c89bba103ff1ed9816120f7a80245c95275d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 24 May 2023 23:12:54 +0300 Subject: [PATCH 1/2] liblxi: add darwin support --- pkgs/development/libraries/liblxi/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix index 4e8b92fe66ae..8531c8ea7c4c 100644 --- a/pkgs/development/libraries/liblxi/default.nix +++ b/pkgs/development/libraries/liblxi/default.nix @@ -11,12 +11,17 @@ stdenv.mkDerivation rec { owner = "lxi-tools"; repo = "liblxi"; rev = "v${version}"; - sha256 = "sha256-jS0huNkbyKrsJ3NkenrYtjkzLakOsTJpwlgSo98ribE="; + hash = "sha256-jS0huNkbyKrsJ3NkenrYtjkzLakOsTJpwlgSo98ribE="; }; nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ]; - buildInputs = [ libtirpc avahi libxml2 ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ + libtirpc + avahi + ] ++ [ + libxml2 + ]; meta = with lib; { description = "Library for communicating with LXI compatible instruments"; @@ -28,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://lxi-tools.github.io/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vq ]; }; } From a9922bfb34053128d1cd4ed4d0f7742a165fd2c2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 24 May 2023 23:13:04 +0300 Subject: [PATCH 2/2] lxi-tools-gui: add darwin support --- pkgs/tools/networking/lxi-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix index 375149655ae6..dc0b5f16ac6b 100644 --- a/pkgs/tools/networking/lxi-tools/default.nix +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://lxi-tools.github.io/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vq ]; }; }