diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-08-06 15:46:30 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2022-08-06 20:51:43 +0200 |
| commit | 0fd439982dcae934363f7b1c164033cf0ec52aa1 (patch) | |
| tree | 0f9e085772a68a9bfd7a0f66d423fc457073b800 | |
| parent | b4a648e1fcadae74e72f6fa5323ea811d0f4d464 (diff) | |
| download | nixpkgs-0fd439982dcae934363f7b1c164033cf0ec52aa1.tar nixpkgs-0fd439982dcae934363f7b1c164033cf0ec52aa1.tar.gz nixpkgs-0fd439982dcae934363f7b1c164033cf0ec52aa1.tar.bz2 nixpkgs-0fd439982dcae934363f7b1c164033cf0ec52aa1.tar.lz nixpkgs-0fd439982dcae934363f7b1c164033cf0ec52aa1.tar.xz nixpkgs-0fd439982dcae934363f7b1c164033cf0ec52aa1.tar.zst nixpkgs-0fd439982dcae934363f7b1c164033cf0ec52aa1.zip | |
virt-manager: fix build on darwin
| -rw-r--r-- | pkgs/applications/virtualization/virt-manager/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/admin/gtk-vnc/default.nix | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 272e10318ef..65bd4bcecb4 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -64,6 +64,10 @@ python3.pkgs.buildPythonApplication rec { gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ cpio e2fsprogs file findutils gzip ]}") makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + + # Fixes testCLI0051virt_install_initrd_inject on Darwin: "cpio: root:root: invalid group" + substituteInPlace virtinst/install/installerinject.py \ + --replace "'--owner=root:root'" "'--owner=0:0'" ''; checkInputs = with python3.pkgs; [ @@ -95,8 +99,7 @@ python3.pkgs.buildPythonApplication rec { manages Xen and LXC (linux containers). ''; license = licenses.gpl2; - # exclude Darwin since libvirt-glib currently doesn't build there - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ qknight offline fpletz globin ]; }; } diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index f4c4b0facde..0f649a6948f 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -9,6 +9,7 @@ , glib , pkg-config , cyrus_sasl +, pulseaudioSupport ? stdenv.isLinux , libpulseaudio , libgcrypt , gtk3 @@ -51,8 +52,13 @@ stdenv.mkDerivation rec { glib libgcrypt cyrus_sasl - libpulseaudio gtk3 + ] ++ lib.optionals pulseaudioSupport [ + libpulseaudio + ]; + + mesonFlags = lib.optionals (!pulseaudioSupport) [ + "-Dpulseaudio=disabled" ]; passthru = { @@ -67,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/gtk-vnc"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } |