diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
| commit | 647438344bfc1f77791391e2b4f98eef865c63dc (patch) | |
| tree | ef580867fc6cc413940e4330d939cf1afda082cb /nixpkgs/pkgs/development/libraries/pipewire | |
| parent | b084c6a0fab7f32c904c5c8e8db8dddcefbe507f (diff) | |
| parent | e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b (diff) | |
| download | nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.gz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.bz2 nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.lz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.xz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.zst nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.zip | |
Merge commit 'e3474e1d1e53'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pipewire')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/pipewire/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 4cfcf9b3a6d8..7b470f836756 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -18,6 +18,7 @@ , libusb1 , udev , libsndfile +, vulkanSupport ? true , vulkan-headers , vulkan-loader , webrtc-audio-processing @@ -125,8 +126,6 @@ stdenv.mkDerivation(finalAttrs: { ncurses readline udev - vulkan-headers - vulkan-loader tinycompress ] ++ (if enableSystemd then [ systemd ] else [ eudev ]) ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) @@ -140,6 +139,7 @@ stdenv.mkDerivation(finalAttrs: { ++ lib.optional zeroconfSupport avahi ++ lib.optional raopSupport openssl ++ lib.optional rocSupport roc-toolkit + ++ lib.optionals vulkanSupport [ vulkan-headers vulkan-loader ] ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ] ++ lib.optional mysofaSupport libmysofa ++ lib.optional ffadoSupport ffado; @@ -175,7 +175,7 @@ stdenv.mkDerivation(finalAttrs: { (lib.mesonOption "sysconfdir" "/etc") (lib.mesonEnable "raop" raopSupport) (lib.mesonOption "session-managers" "") - (lib.mesonEnable "vulkan" true) + (lib.mesonEnable "vulkan" vulkanSupport) (lib.mesonEnable "x11" x11Support) (lib.mesonEnable "x11-xfixes" x11Support) (lib.mesonEnable "libcanberra" x11Support) |