diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix index 1a47cb27c16e..6168c252e310 100644 --- a/nixos/modules/services/desktops/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire.nix @@ -11,11 +11,11 @@ let jack-libs = pkgs.runCommand "jack-libs" {} '' mkdir -p "$out/lib" - ln -s "${pkgs.pipewire.lib}"/lib/pipewire-*/jack "$out/lib/pipewire" + ln -s "${pkgs.pipewire.jack}/lib" "$out/lib/pipewire" ''; pulse-libs = pkgs.runCommand "pulse-libs" {} '' mkdir -p "$out/lib" - ln -s "${pkgs.pipewire.lib}"/lib/pipewire-*/pulse "$out/lib/pipewire" + ln -s "${pkgs.pipewire.pulse}/lib" "$out/lib/pipewire" ''; in { diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 706d170ea430..8fc3ecb38736 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -39,7 +39,15 @@ stdenv.mkDerivation rec { pname = "pipewire"; version = "0.3.9"; - outputs = [ "out" "lib" "dev" "doc" "installedTests" ]; + outputs = [ + "out" + "lib" + "pulse" + "jack" + "dev" + "doc" + "installedTests" + ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -95,6 +103,8 @@ stdenv.mkDerivation rec { "-Dgstreamer=true" "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=true" + "-Dlibpulse-path=${placeholder "pulse"}/lib" + "-Dlibjack-path=${placeholder "jack"}/lib" ] ++ stdenv.lib.optional nativeHspSupport "-Dbluez5-backend-native=true" ++ stdenv.lib.optional ofonoSupport "-Dbluez5-backend-ofono=true";