commit abecdfea738e9be0f375f9d9019ed52b293f82d2 · pyrox.dev/nixpkgs

-6

nixos/modules/services/desktops/pipewire/README.md

···

       1
       1
       -
       # Updating

     

       2
       2
       -
       

     

       3
       3
       -
       1. Update the version & hash in pkgs/development/libraries/pipewire/default.nix

     

       4
       4
       -
       2. run `nix build -f /path/to/nixpkgs/checkout pipewire pipewire.mediaSession`

     

       5
       5
       -
       3. copy all JSON files from result/etc/pipewire and result-mediaSession/etc/pipewire/media-session.d to this directory

     

       6
       6
       -
       4. add new files to the module config and passthru tests

+1 -1

nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json

···

       9
       9
        
             ],

     

       10
       10
        
             "actions": {

     

       11
       11
        
               "update-props": {

     

       12
       12
       -
                 "bluez5.reconnect-profiles": [

     

       12
       12
       +
                 "bluez5.auto-connect": [

     

       13
       13
        
                   "hfp_hf",

     

       14
       14
        
                   "hsp_hs",

     

       15
       15
        
                   "a2dp_sink"

+1

nixos/modules/services/desktops/pipewire/media-session.conf.json

···

       59
       59
        
           "with-pulseaudio": [

     

       60
       60
        
             "with-audio",

     

       61
       61
        
             "bluez5",

     

       62
       62
       +
             "logind",

     

       62
       63
        
             "restore-stream",

     

       63
       64
        
             "streams-follow-default"

     

       64
       65
        
           ]

+4 -1

nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json

···

       30
       30
        
             "args": {

     

       31
       31
        
               "server.address": [

     

       32
       32
        
                 "unix:native"

     

       33
       33
       -
               ]

     

       33
       33
       +
               ],

     

       34
       34
       +
               "vm.overrides": {

     

       35
       35
       +
                 "pulse.min.quantum": "1024/48000"

     

       36
       36
       +
               }

     

       34
       37
        
             }

     

       35
       38
        
           }

     

       36
       39
        
         ],

+4 -1

nixos/modules/services/desktops/pipewire/pipewire.conf.json

···

       2
       2
        
         "context.properties": {

     

       3
       3
        
           "link.max-buffers": 16,

     

       4
       4
        
           "core.daemon": true,

     

       5
       5
       -
           "core.name": "pipewire-0"

     

       5
       5
       +
           "core.name": "pipewire-0",

     

       6
       6
       +
           "vm.overrides": {

     

       7
       7
       +
             "default.clock.min-quantum": 1024

     

       8
       8
       +
           }

     

       6
       9
        
         },

     

       7
       10
        
         "context.spa-libs": {

     

       8
       11
        
           "audio.convert.*": "audioconvert/libspa-audioconvert",

+10

nixos/tests/installed-tests/pipewire.nix

···

       2
       2
        
       

     

       3
       3
        
       makeInstalledTest {

     

       4
       4
        
         tested = pkgs.pipewire;

     

       5
       5
       +
         testConfig = {

     

       6
       6
       +
           hardware.pulseaudio.enable = false;

     

       7
       7
       +
           services.pipewire = {

     

       8
       8
       +
             enable = true;

     

       9
       9
       +
             pulse.enable = true;

     

       10
       10
       +
             jack.enable = true;

     

       11
       11
       +
             alsa.enable = true;

     

       12
       12
       +
             alsa.support32Bit = true;

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       5
       15
        
       }

+6 -6

pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch

···

       1
       1
        
       diff --git a/meson.build b/meson.build

     

       2
       2
       -
       index ffee41b4..f3e4ec74 100644

     

       2
       2
       +
       index 99a4b2d1..d4a4cda7 100644

     

       3
       3
        
       --- a/meson.build

     

       4
       4
        
       +++ b/meson.build

     

       5
       5
       -
       @@ -53,7 +53,7 @@ endif

     

       5
       5
       +
       @@ -55,7 +55,7 @@ endif

     

       6
       6
        
        

     

       7
       7
       -
        spa_plugindir = join_paths(pipewire_libdir, spa_name)

     

       7
       7
       +
        spa_plugindir = pipewire_libdir / spa_name

     

       8
       8
        
        

     

       9
       9
       -
       -alsadatadir = join_paths(pipewire_datadir, 'alsa-card-profile', 'mixer')

     

       10
       10
       -
       +alsadatadir = join_paths(pipewire_libdir, '..', 'share', 'alsa-card-profile', 'mixer')

     

       9
       9
       +
       -alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer'

     

       10
       10
       +
       +alsadatadir = pipewire_libdir / '..' / 'share' / 'alsa-card-profile' / 'mixer'

     

       11
       11
        
        

     

       12
       12
       -
        pipewire_headers_dir = join_paths(pipewire_name, 'pipewire')

     

       12
       12
       +
        pipewire_headers_dir = pipewire_name / 'pipewire'

     

       13
       13

+7 -7

pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch

···

       1
       1
        
       diff --git a/meson_options.txt b/meson_options.txt

     

       2
       2
       -
       index ce364d93..a6c8af72 100644

     

       2
       2
       +
       index 66791f3a..93b5e2a9 100644

     

       3
       3
        
       --- a/meson_options.txt

     

       4
       4
        
       +++ b/meson_options.txt

     

       5
       5
       -
       @@ -152,6 +152,9 @@ option('udev',

     

       5
       5
       +
       @@ -172,6 +172,9 @@ option('udev',

     

       6
       6
        
        option('udevrulesdir',

     

       7
       7
        
               type : 'string',

     

       8
       8
        
               description : 'Directory for udev rules (defaults to /lib/udev/rules.d)')

     
···

       13
       13
        
               type : 'string',

     

       14
       14
        
               description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)')

     

       15
       15
        
       diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build

     

       16
       16
       -
       index 0a5e5042..4a70b0b0 100644

     

       16
       16
       +
       index aa30a86f..1edebb2d 100644

     

       17
       17
        
       --- a/src/daemon/systemd/user/meson.build

     

       18
       18
        
       +++ b/src/daemon/systemd/user/meson.build

     

       19
       19
        
       @@ -9,7 +9,7 @@ install_data(

     

       20
       20
        
        

     

       21
       21
        
        systemd_config = configuration_data()

     

       22
       22
       -
        systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))

     

       23
       23
       -
       -systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse'))

     

       24
       24
       -
       +systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse'))

     

       25
       25
       -
        systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))

     

       22
       22
       +
        systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')

     

       23
       23
       +
       -systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse')

     

       24
       24
       +
       +systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse')

     

       25
       25
       +
        systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')

     

       26
       26
        
        

     

       27
       27
        
        configure_file(input : 'pipewire.service.in',

+8 -8

pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch

···

       1
       1
        
       diff --git a/meson_options.txt b/meson_options.txt

     

       2
       2
       -
       index e2a1e028..310029f2 100644

     

       2
       2
       +
       index 93b5e2a9..1b915ac3 100644

     

       3
       3
        
       --- a/meson_options.txt

     

       4
       4
        
       +++ b/meson_options.txt

     

       5
       5
       -
       @@ -10,6 +10,9 @@ option('media-session',

     

       5
       5
       +
       @@ -13,6 +13,9 @@ option('media-session',

     

       6
       6
        
               description: 'Build and install pipewire-media-session',

     

       7
       7
        
               type: 'feature',

     

       8
       8
        
               value: 'auto')

     
···

       13
       13
        
               description: 'Build manpages',

     

       14
       14
        
               type: 'feature',

     

       15
       15
        
       diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build

     

       16
       16
       -
       index 5c4d1af0..7296220f 100644

     

       16
       16
       +
       index 1edebb2d..251270eb 100644

     

       17
       17
        
       --- a/src/daemon/systemd/user/meson.build

     

       18
       18
        
       +++ b/src/daemon/systemd/user/meson.build

     

       19
       19
        
       @@ -10,7 +10,7 @@ install_data(

     

       20
       20
        
        systemd_config = configuration_data()

     

       21
       21
       -
        systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))

     

       22
       22
       -
        systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse'))

     

       23
       23
       -
       -systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))

     

       24
       24
       -
       +systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(get_option('media-session-prefix'), 'bin/pipewire-media-session'))

     

       25
       25
       -
       

     

       21
       21
       +
        systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')

     

       22
       22
       +
        systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse')

     

       23
       23
       +
       -systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')

     

       24
       24
       +
       +systemd_config.set('PW_MEDIA_SESSION_BINARY', get_option('media-session-prefix') / 'bin/pipewire-media-session')

     

       25
       25
       +
        

     

       26
       26
        
        configure_file(input : 'pipewire.service.in',

     

       27
       27
        
                       output : 'pipewire.service',

+10 -10

pkgs/development/libraries/pipewire/0070-installed-tests-path.patch

···

       1
       1
        
       diff --git a/meson.build b/meson.build

     

       2
       2
       -
       index 97d4d939..b17358e5 100644

     

       2
       2
       +
       index d4a4cda7..a27569bd 100644

     

       3
       3
        
       --- a/meson.build

     

       4
       4
        
       +++ b/meson.build

     

       5
       5
        
       @@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd'

     

       6
       6
       -
       

     

       6
       6
       +
        

     

       7
       7
        
        alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa'))

     

       8
       8
       -
       

     

       9
       9
       -
       -installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name)

     

       10
       10
       -
       -installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name)

     

       11
       11
       -
       +installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', pipewire_name)

     

       12
       12
       -
       +installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', pipewire_name)

     

       8
       8
       +
        

     

       9
       9
       +
       -installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name

     

       10
       10
       +
       -installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name

     

       11
       11
       +
       +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / pipewire_name

     

       12
       12
       +
       +installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / pipewire_name

     

       13
       13
        
        installed_tests_enabled = not get_option('installed_tests').disabled()

     

       14
       14
        
        installed_tests_template = files('template.test.in')

     

       15
       15
       -
       

     

       15
       15
       +
        

     

       16
       16
        
       diff --git a/meson_options.txt b/meson_options.txt

     

       17
       17
       -
       index fba0d647..8c6106cd 100644

     

       17
       17
       +
       index 1b915ac3..85beb86a 100644

     

       18
       18
        
       --- a/meson_options.txt

     

       19
       19
        
       +++ b/meson_options.txt

     

       20
       20
       -
       @@ -26,6 +26,9 @@ option('installed_tests',

     

       20
       20
       +
       @@ -29,6 +29,9 @@ option('installed_tests',

     

       21
       21
        
               description: 'Install manual and automated test executables',

     

       22
       22
        
               type: 'feature',

     

       23
       23
        
               value: 'disabled')

+12 -12

pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch

···

       1
       1
        
       diff --git a/meson.build b/meson.build

     

       2
       2
       -
       index 0073eb13..0ffc6863 100644

     

       2
       2
       +
       index a27569bd..fcf18344 100644

     

       3
       3
        
       --- a/meson.build

     

       4
       4
        
       +++ b/meson.build

     

       5
       5
       -
       @@ -34,7 +34,10 @@ pipewire_libexecdir = join_paths(prefix, get_option('libexecdir'))

     

       6
       6
       -
        pipewire_localedir = join_paths(prefix, get_option('localedir'))

     

       7
       7
       -
        pipewire_sysconfdir = join_paths(prefix, get_option('sysconfdir'))

     

       5
       5
       +
       @@ -36,7 +36,10 @@ pipewire_libexecdir = prefix / get_option('libexecdir')

     

       6
       6
       +
        pipewire_localedir = prefix / get_option('localedir')

     

       7
       7
       +
        pipewire_sysconfdir = prefix / get_option('sysconfdir')

     

       8
       8
        
        

     

       9
       9
       -
       -pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire')

     

       9
       9
       +
       -pipewire_configdir = pipewire_sysconfdir / 'pipewire'

     

       10
       10
        
       +pipewire_configdir = get_option('pipewire_config_dir')

     

       11
       11
        
       +if pipewire_configdir == ''

     

       12
       12
       -
       +  pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire')

     

       12
       12
       +
       +  pipewire_configdir = pipewire_sysconfdir / 'pipewire'

     

       13
       13
        
       +endif

     

       14
       14
       -
        modules_install_dir = join_paths(pipewire_libdir, pipewire_name)

     

       14
       14
       +
        modules_install_dir = pipewire_libdir / pipewire_name

     

       15
       15
        
        

     

       16
       16
        
        if host_machine.system() == 'linux'

     

       17
       17
        
       diff --git a/meson_options.txt b/meson_options.txt

     

       18
       18
       -
       index 4b9e46b8..8c301459 100644

     

       18
       18
       +
       index 85beb86a..372e8faa 100644

     

       19
       19
        
       --- a/meson_options.txt

     

       20
       20
        
       +++ b/meson_options.txt

     

       21
       21
       -
       @@ -56,6 +56,9 @@ option('pipewire-pulseaudio',

     

       22
       22
       -
        option('libpulse-path',

     

       23
       23
       -
               description: 'Where to install the libpulse.so library',

     

       21
       21
       +
       @@ -67,6 +67,9 @@ option('jack-devel',

     

       22
       22
       +
        option('libjack-path',

     

       23
       23
       +
               description: 'Where to install the libjack.so library',

     

       24
       24
        
               type: 'string')

     

       25
       25
        
       +option('pipewire_config_dir',

     

       26
       26
        
       +       type : 'string',

     

       27
       27
        
       +       description : 'Directory for pipewire configuration (defaults to /etc/pipewire)')

     

       28
       28
        
        option('spa-plugins',

     

       29
       29
        
               description: 'Enable spa plugins integration',

     

       30
       30
       -
               type: 'boolean',

     

       30
       30
       +
               type: 'feature',

+26 -24

pkgs/development/libraries/pipewire/default.nix

···

       42
       42
        
       

     

       43
       43
        
         self = stdenv.mkDerivation rec {

     

       44
       44
        
           pname = "pipewire";

     

       45
       45
       -
           version = "0.3.25";

     

       45
       45
       +
           version = "0.3.26";

     

       46
       46
        
       

     

       47
       47
        
           outputs = [

     

       48
       48
        
             "out"

     
···

       60
       60
        
             owner = "pipewire";

     

       61
       61
        
             repo = "pipewire";

     

       62
       62
        
             rev = version;

     

       63
       63
       -
             hash = "sha256:EbXWcf6QLtbvm6/eXBI+PF2sTw2opYfmc+H/SMDEH1U=";

     

       63
       63
       +
             sha256 = "sha256-s9+70XXMN4K3yDVwIu+L15gL6rFlpRNVQpeekZQOEec=";

     

       64
       64
        
           };

     

       65
       65
        
       

     

       66
       66
        
           patches = [

     
···

       146
       146
        
             moveToOutput "bin/pipewire-pulse" "$pulse"

     

       147
       147
        
           '';

     

       148
       148
        
       

     

       149
       149
       -
           passthru.tests = {

     

       150
       150
       -
             installedTests = nixosTests.installed-tests.pipewire;

     

       149
       149
       +
           passthru = {

     

       150
       150
       +
             updateScript = ./update.sh;

     

       151
       151
       +
             tests = {

     

       152
       152
       +
               installedTests = nixosTests.installed-tests.pipewire;

     

       151
       153
        
       

     

       152
       152
       -
             # This ensures that all the paths used by the NixOS module are found.

     

       153
       153
       -
             test-paths = callPackage ./test-paths.nix {

     

       154
       154
       -
               paths-out = [

     

       155
       155
       -
                 "share/alsa/alsa.conf.d/50-pipewire.conf"

     

       156
       156
       -
                 "nix-support/etc/pipewire/client.conf.json"

     

       157
       157
       -
                 "nix-support/etc/pipewire/client-rt.conf.json"

     

       158
       158
       -
                 "nix-support/etc/pipewire/jack.conf.json"

     

       159
       159
       -
                 "nix-support/etc/pipewire/pipewire.conf.json"

     

       160
       160
       -
                 "nix-support/etc/pipewire/pipewire-pulse.conf.json"

     

       161
       161
       -
               ];

     

       162
       162
       -
               paths-out-media-session = [

     

       163
       163
       -
                 "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"

     

       164
       164
       -
                 "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"

     

       165
       165
       -
                 "nix-support/etc/pipewire/media-session.d/media-session.conf.json"

     

       166
       166
       -
                 "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"

     

       167
       167
       -
               ];

     

       168
       168
       -
               paths-lib = [

     

       169
       169
       -
                 "lib/alsa-lib/libasound_module_pcm_pipewire.so"

     

       170
       170
       -
                 "share/alsa-card-profile/mixer"

     

       171
       171
       -
               ];

     

       154
       154
       +
               # This ensures that all the paths used by the NixOS module are found.

     

       155
       155
       +
               test-paths = callPackage ./test-paths.nix {

     

       156
       156
       +
                 paths-out = [

     

       157
       157
       +
                   "share/alsa/alsa.conf.d/50-pipewire.conf"

     

       158
       158
       +
                   "nix-support/etc/pipewire/client.conf.json"

     

       159
       159
       +
                   "nix-support/etc/pipewire/jack.conf.json"

     

       160
       160
       +
                   "nix-support/etc/pipewire/pipewire.conf.json"

     

       161
       161
       +
                   "nix-support/etc/pipewire/pipewire-pulse.conf.json"

     

       162
       162
       +
                 ];

     

       163
       163
       +
                 paths-out-media-session = [

     

       164
       164
       +
                   "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"

     

       165
       165
       +
                   "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"

     

       166
       166
       +
                   "nix-support/etc/pipewire/media-session.d/media-session.conf.json"

     

       167
       167
       +
                   "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"

     

       168
       168
       +
                 ];

     

       169
       169
       +
                 paths-lib = [

     

       170
       170
       +
                   "lib/alsa-lib/libasound_module_pcm_pipewire.so"

     

       171
       171
       +
                   "share/alsa-card-profile/mixer"

     

       172
       172
       +
                 ];

     

       173
       173
       +
               };

     

       172
       174
        
             };

     

       173
       175
        
           };

     

       174
       176

+1 -1

pkgs/development/libraries/pipewire/test-paths.nix

···

       1
       1
       -
       { lib, runCommand, pipewire, paths-out, paths-lib }:

     

       1
       1
       +
       { lib, runCommand, pipewire, paths-out, paths-lib, paths-out-media-session }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         check-path = output: path: ''

+24

pkgs/development/libraries/pipewire/update.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -p nix-update -i bash

     

       3
       3
       +
       # shellcheck shell=bash

     

       4
       4
       +
       

     

       5
       5
       +
       set -o errexit -o pipefail -o nounset -o errtrace

     

       6
       6
       +
       shopt -s inherit_errexit

     

       7
       7
       +
       shopt -s nullglob

     

       8
       8
       +
       IFS=$'\n'

     

       9
       9
       +
       

     

       10
       10
       +
       NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"

     

       11
       11
       +
       

     

       12
       12
       +
       cd "$NIXPKGS_ROOT"

     

       13
       13
       +
       nix-update pipewire

     

       14
       14
       +
       outputs=$(nix-build . -A pipewire -A pipewire.mediaSession)

     

       15
       15
       +
       for p in $outputs; do

     

       16
       16
       +
           conf_files=$(find "$p/nix-support/etc/pipewire/" -name '*.conf.json')

     

       17
       17
       +
           for c in $conf_files; do

     

       18
       18
       +
               file_name=$(basename "$c")

     

       19
       19
       +
               if [[ ! -e "nixos/modules/services/desktops/pipewire/$file_name" ]]; then

     

       20
       20
       +
                   echo "New file $file_name found! Add it to the module config and passthru tests!"

     

       21
       21
       +
               fi

     

       22
       22
       +
               install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/"

     

       23
       23
       +
           done

     

       24
       24
       +
       done