diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 4af6f3b4db402..ac4c5aba3b175 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/libosinfo/osinfo-db/"; changelog = "https://gitlab.com/libosinfo/osinfo-db/-/commits/v${version}"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index a1dd23357decd..e999ddd4b6b99 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { homepage = "https://libosinfo.org/"; changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index f86edf1bfbcb5..84b66f05be795 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -46,10 +46,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libcap_ng libvirt libxml2 gobject-introspection + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng ]; strictDeps = true; @@ -66,6 +67,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://libvirt.org/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 42ccf8fddcf68..4fbbcc8d3c64e 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -140,7 +140,9 @@ stdenv.mkDerivation rec { # delete only the first occurrence of this sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build '' + optionalString isDarwin '' - sed -i '/qemucapabilitiestest/d' tests/meson.build + sed -i tests/meson.build \ + -e '/qemucapabilitiestest/d' \ + -e '/vircryptotest/d' ''; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index db5db61c6e991..8d914ed35bec7 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -33,7 +33,7 @@ , vala , wayland-protocols , zlib -, withPolkit ? true +, withPolkit ? (!stdenv.isDarwin) }: # If this package is built with polkit support (withPolkit=true), @@ -78,6 +78,8 @@ stdenv.mkDerivation rec { "# meson.add_install_script('../build-aux/setcap-or-suid'," ''; + NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-Wno-unused-function -Wno-missing-field-initializers" else null; + nativeBuildInputs = [ docbook_xsl gettext @@ -104,20 +106,18 @@ stdenv.mkDerivation rec { gtk3 json-glib libcacard - libcap_ng - libdrm libjpeg_turbo libopus libusb1 lz4 openssl - phodav pixman spice-protocol usbredir - wayland-protocols zlib - ] ++ lib.optionals withPolkit [ polkit acl ] ; + ] + ++ lib.optionals withPolkit [ polkit acl ] + ++ lib.optionals (!stdenv.isDarwin) [ libcap_ng libdrm phodav wayland-protocols ]; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; @@ -126,6 +126,9 @@ stdenv.mkDerivation rec { "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" ] ++ lib.optionals (!withPolkit) [ "-Dpolkit=disabled" + ] ++ lib.optionals stdenv.isDarwin [ + "-Dwebdav=disabled" # no phodav + "-Dlibcap-ng=disabled" ]; meta = with lib; { @@ -140,6 +143,6 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/"; license = licenses.lgpl21; maintainers = [ maintainers.xeji ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 60f532b9779a1..797c32cb6d2d9 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/usbredir.html"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 16a800110942c..f113081cc24df 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -78,6 +78,8 @@ stdenv.mkDerivation rec { mesonFlags = lib.optionals (!systemdSupport) [ "-D_systemd=false" + ] ++ lib.optionals stdenv.isDarwin [ + "-D_b_symbolic_functions=false" ]; postPatch = '' diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index b0ccd5f76354d..1b98c2e32c47d 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config , libsndfile, libtool, makeWrapper, perlPackages , xorg, libcap, alsa-lib, glib, dconf -, avahi, libjack2, libasyncns, lirc, dbus +, avahi, libjack2, libasyncns, lirc, libintl, dbus , sbc, bluez5, udev, openssl, fftwFloat , soxr, speexdsp, systemd, webrtc-audio-processing , check, meson, ninja, m4 @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool libsndfile soxr speexdsp fftwFloat check ] ++ lib.optionals stdenv.isLinux [ glib dbus ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices libintl ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 060c95a8f7672..e478d905483bf 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -67,6 +67,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; }; } diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 189f549e172f1..cf0ab2776ba57 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://libosinfo.org/"; changelog = "https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v${version}/NEWS"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; }