mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-24 22:27:30 +03:00
Merge pull request #188532 from wegank/pulseaudio-compat
This commit is contained in:
commit
ff94c4e74f
@ -263,7 +263,7 @@ in {
|
|||||||
(drv: drv.override { pulseaudio = overriddenPackage; })
|
(drv: drv.override { pulseaudio = overriddenPackage; })
|
||||||
cfg.extraModules;
|
cfg.extraModules;
|
||||||
modulePaths = builtins.map
|
modulePaths = builtins.map
|
||||||
(drv: "${drv}/${overriddenPackage.pulseDir}/modules")
|
(drv: "${drv}/lib/pulseaudio/modules")
|
||||||
# User-provided extra modules take precedence
|
# User-provided extra modules take precedence
|
||||||
(overriddenModules ++ [ overriddenPackage ]);
|
(overriddenModules ++ [ overriddenPackage ]);
|
||||||
in lib.concatStringsSep ":" modulePaths;
|
in lib.concatStringsSep ":" modulePaths;
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
From 72f3fe059f031f24c5ad026cb2fc16318f227c09 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andrew Childs <andrew.childs@bibo.com.ph>
|
|
||||||
Date: Tue, 19 Apr 2022 16:29:58 +0900
|
|
||||||
Subject: [PATCH 1/8] Make gio-2.0 optional when gsettings is disabled
|
|
||||||
|
|
||||||
Derived from https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654
|
|
||||||
---
|
|
||||||
meson.build | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index d7e468cab..f7adf1413 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -614,7 +614,7 @@ if dbus_dep.found()
|
|
||||||
cdata.set('HAVE_DBUS', 1)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
|
|
||||||
+gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : false)
|
|
||||||
if get_option('gsettings').enabled()
|
|
||||||
assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
|
|
||||||
cdata.set('HAVE_GSETTINGS', 1)
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||||||
# but use a conventional runtime sysconfdir outside the store
|
# but use a conventional runtime sysconfdir outside the store
|
||||||
./add-option-for-installation-sysconfdir.patch
|
./add-option-for-installation-sysconfdir.patch
|
||||||
# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654
|
# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654
|
||||||
(./. + "/0001-Make-gio-2.0-optional-${lib.versions.major version}.patch")
|
./0001-Make-gio-2.0-optional-16.patch
|
||||||
# TODO (not sent upstream)
|
# TODO (not sent upstream)
|
||||||
./0002-Ignore-SCM_CREDS-on-darwin.patch
|
./0002-Ignore-SCM_CREDS-on-darwin.patch
|
||||||
./0003-Ignore-HAVE_CPUID_H-on-aarch64-darwin.patch
|
./0003-Ignore-HAVE_CPUID_H-on-aarch64-darwin.patch
|
||||||
@ -147,20 +147,12 @@ stdenv.mkDerivation rec {
|
|||||||
''
|
''
|
||||||
# add .so symlinks for modules to be found under macOS
|
# add .so symlinks for modules to be found under macOS
|
||||||
+ lib.optionalString stdenv.isDarwin ''
|
+ lib.optionalString stdenv.isDarwin ''
|
||||||
for file in $out/${passthru.pulseDir}/modules/*.dylib; do
|
for file in $out/lib/pulseaudio/modules/*.dylib; do
|
||||||
ln -s "''$file" "''${file%.dylib}.so"
|
ln -s "''$file" "''${file%.dylib}.so"
|
||||||
ln -s "''$file" "$out/lib/pulseaudio/''$(basename ''$file .dylib).so"
|
ln -s "''$file" "$out/lib/pulseaudio/''$(basename ''$file .dylib).so"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
|
||||||
pulseDir =
|
|
||||||
if (lib.versionAtLeast version "16.0") then
|
|
||||||
"lib/pulseaudio"
|
|
||||||
else
|
|
||||||
"lib/pulse-" + lib.versions.majorMinor version;
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Sound server for POSIX and Win32 systems";
|
description = "Sound server for POSIX and Win32 systems";
|
||||||
homepage = "http://www.pulseaudio.org/";
|
homepage = "http://www.pulseaudio.org/";
|
||||||
|
Loading…
Reference in New Issue
Block a user