diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-01-05 21:33:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-05 21:33:07 +0000 |
commit | 989238ec03360b6a2efc09f3ac969cd34a1d85ad (patch) | |
tree | 47f9505705106def6f69b38578954f4c8981e6aa /pkgs/development/libraries | |
parent | 06509d51b4e43c081ae8e5162d2805b53d3176b8 (diff) | |
parent | 7678a5848c057ec8298c84902b5de7213a56fdea (diff) |
Merge pull request #153426 from 4z3/systemwide-pipewire
nixos/pipewire: add systemWide option
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/pipewire/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/pipewire/media-session.nix | 15 |
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c00e297b68af9..b6d96492fce79 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -2,6 +2,7 @@ , lib , buildPackages , fetchFromGitLab +, fetchpatch , removeReferencesTo , python3 , meson @@ -102,6 +103,15 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch + # Fix attempt to put system service units into pkgs.systemd. + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b666edde787b167c6e19b9356257d48007357acc.diff"; + sha256 = "1pmnyyvrjykr46ld4a5frq3cc739f8h4jwvfj414lyx8c6ybm63s"; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5054b48c9de655b4b48f7c801cb305d9eb122520.diff"; + sha256 = "0myhb7h4g7x2nr08dpx8d7nqhsmzp90yanmkvm627r1xxnnr3ivn"; + }) ]; nativeBuildInputs = [ @@ -154,6 +164,7 @@ let "-Dlibpulse=${mesonEnable pulseTunnelSupport}" "-Davahi=${mesonEnable zeroconfSupport}" "-Dgstreamer=${mesonEnable gstreamerSupport}" + "-Dsystemd-system-service=enabled" "-Dffmpeg=${mesonEnable ffmpegSupport}" "-Dbluez5=${mesonEnable bluezSupport}" "-Dbluez5-backend-hsp-native=${mesonEnable nativeHspSupport}" diff --git a/pkgs/development/libraries/pipewire/media-session.nix b/pkgs/development/libraries/pipewire/media-session.nix index 47cb3b415956a..19940d8d7477a 100644 --- a/pkgs/development/libraries/pipewire/media-session.nix +++ b/pkgs/development/libraries/pipewire/media-session.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -30,6 +31,19 @@ let sha256 = "sha256-e537gTkiNYMz2YJrOff/MXYWVDgHZDkqkSn8Qh+7Wr4="; }; + patches = [ + # Fix `ERROR: Tried to access unknown option "session-managers".` + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/media-session/-/commit/dfa740175c83e1cd0d815ad423f90872de566437.diff"; + sha256 = "01rfwq8ipm8wyv98rxal1s5zrkf0pn9hgrngiq2wdbwj6vjdnr1h"; + }) + # Fix attempt to put system service units into pkgs.systemd. + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/media-session/-/commit/2ff6b0baec7325dde229013b9d37c93f8bc7edee.diff"; + sha256 = "18gg7ca04ihl4ylnw78wdyrbvg66m8w43gg0wp258x4nv95gpps2"; + }) + ]; + nativeBuildInputs = [ doxygen graphviz @@ -48,6 +62,7 @@ let mesonFlags = [ "-Ddocs=enabled" + "-Dsystemd-system-service=enabled" # We generate these empty files from the nixos module, don't bother installing them "-Dwith-module-sets=[]" ]; |