diff options
3 files changed, 16 insertions, 29 deletions
diff --git a/nixos/tests/installed-tests/pipewire.nix b/nixos/tests/installed-tests/pipewire.nix index b04265658fcf4..6e69ada8612fd 100644 --- a/nixos/tests/installed-tests/pipewire.nix +++ b/nixos/tests/installed-tests/pipewire.nix @@ -1,15 +1,5 @@ -{ pkgs, lib, makeInstalledTest, ... }: +{ pkgs, makeInstalledTest, ... }: makeInstalledTest { tested = pkgs.pipewire; - testConfig = { - hardware.pulseaudio.enable = false; - services.pipewire = { - enable = true; - pulse.enable = true; - jack.enable = true; - alsa.enable = true; - alsa.support32Bit = true; - }; - }; } diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index b4c9f8ed2aab5..ca7d351257bf9 100644 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in -index 6464839a0..05546201f 100644 +index 9c885a38f..c474eb45d 100644 --- a/src/daemon/minimal.conf.in +++ b/src/daemon/minimal.conf.in -@@ -110,7 +110,7 @@ context.modules = [ +@@ -111,7 +111,7 @@ context.modules = [ # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ @@ -11,7 +11,7 @@ index 6464839a0..05546201f 100644 #] # An array of rejected paths. -@@ -298,5 +298,5 @@ context.exec = [ +@@ -359,5 +359,5 @@ context.exec = [ # It can be interesting to start another daemon here that listens # on another address with the -a option (eg. -a tcp:4713). # @@ -19,10 +19,10 @@ index 6464839a0..05546201f 100644 + #@pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" } ] diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index a948a1b9b..4ece43c6f 100644 +index 697bf094d..3a7b54ddd 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in -@@ -132,7 +132,7 @@ context.modules = [ +@@ -142,7 +142,7 @@ context.modules = [ # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ @@ -31,18 +31,20 @@ index a948a1b9b..4ece43c6f 100644 #] # An array of rejected paths. -@@ -246,12 +246,12 @@ context.exec = [ +@@ -294,7 +294,7 @@ context.exec = [ # but it is better to start it as a systemd service. # Run the session manager with -h for options. # -- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } -+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" } +- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" ++ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" + @sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] } # # You can optionally start the pulseaudio-server here as well - # but it is better to start it as a systemd service. +@@ -302,6 +302,6 @@ context.exec = [ # It can be interesting to start another daemon here that listens # on another address with the -a option (eg. -a tcp:4713). # -- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" } +- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" ++ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" + @pulse_comment@ condition = [ { exec.pipewire-pulse = null } { exec.pipewire-pulse = true } ] } ] diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index a3d423b5c8b41..b9a2fdb5f0ef2 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -73,7 +73,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.69"; + version = "0.3.70"; outputs = [ "out" @@ -91,7 +91,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-1eUyRkXfcvV0scWYPnDSpqJBWJNOYEZX0aVQSQeMwyE="; + sha256 = "sha256-xhJzE6JcfNcLMm+TqTIPaBEnEthEqUZiTqhWz1fO5Ng="; }; patches = [ @@ -107,11 +107,6 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a275e825c75c93775baaeb17479e38d035d9b79a.patch"; - hash = "sha256-y1kDtMy5MgDPv/TgV8xZ8rmzQ12ZsZafKMqJ3+QIu8E="; - }) ]; strictDeps = true; |