From 32b6f46ec035996dbc6f1fce5d9c353376888f8a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 3 Aug 2022 01:56:44 +0200 Subject: [PATCH 1/2] libvirt: fix build on darwin --- pkgs/development/libraries/libvirt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 8c37a9dcf4d3..748fcfcb22fd 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -135,6 +135,7 @@ stdenv.mkDerivation rec { sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build '' + optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build + sed -i '/vircryptotest/d' tests/meson.build ''; @@ -222,7 +223,7 @@ stdenv.mkDerivation rec { --replace "ggrep" "grep" substituteInPlace src/util/virpolkit.h \ - --replace '"/usr/bin/pkttyagent"' '"${polkit.bin}/bin/pkttyagent"' + --replace '"/usr/bin/pkttyagent"' '"${if isLinux then polkit.bin else "/usr"}/bin/pkttyagent"' patchShebangs . '' @@ -268,7 +269,7 @@ stdenv.mkDerivation rec { (feat "numactl" isLinux) (feat "numad" isLinux) (feat "pciaccess" isLinux) - (feat "polkit" true) + (feat "polkit" isLinux) (feat "readline" true) (feat "secdriver_apparmor" isLinux) (feat "tests" true) From eaeb09002a2f6cc2a4bd946488926d9e93e747a8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 3 Aug 2022 01:57:01 +0200 Subject: [PATCH 2/2] libvirt-glib: add darwin support --- pkgs/development/libraries/libvirt-glib/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index f86edf1bfbcb..b7efdf2cf7d8 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -45,8 +45,9 @@ stdenv.mkDerivation rec { gobject-introspection ]; - buildInputs = [ + buildInputs = (lib.optionals stdenv.isLinux [ libcap_ng + ]) ++ [ libvirt libxml2 gobject-introspection @@ -66,6 +67,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://libvirt.org/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; }