diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-08-27 22:02:19 +0200 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-08-27 22:02:19 +0200 |
commit | c882c08f9c59d907bf860e7a3dfd5e69f1a7426e (patch) | |
tree | 2d40c5e6e40134ee6afe9b3efca691dedc4b8383 | |
parent | 324c8aaf25b2f2027af7798e5582ce3040a793b6 (diff) | |
download | nixpkgs-c882c08f9c59d907bf860e7a3dfd5e69f1a7426e.tar nixpkgs-c882c08f9c59d907bf860e7a3dfd5e69f1a7426e.tar.gz nixpkgs-c882c08f9c59d907bf860e7a3dfd5e69f1a7426e.tar.bz2 nixpkgs-c882c08f9c59d907bf860e7a3dfd5e69f1a7426e.tar.lz nixpkgs-c882c08f9c59d907bf860e7a3dfd5e69f1a7426e.tar.xz nixpkgs-c882c08f9c59d907bf860e7a3dfd5e69f1a7426e.tar.zst nixpkgs-c882c08f9c59d907bf860e7a3dfd5e69f1a7426e.zip |
pulseaudio: remove compat for 15.0
-rw-r--r-- | nixos/modules/config/pulseaudio.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/pulseaudio/0001-Make-gio-2.0-optional-15.patch | 26 | ||||
-rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 12 |
3 files changed, 3 insertions, 37 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index aa3ca549f09..096152cefe9 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -263,7 +263,7 @@ in { (drv: drv.override { pulseaudio = overriddenPackage; }) cfg.extraModules; modulePaths = builtins.map - (drv: "${drv}/${overriddenPackage.pulseDir}/modules") + (drv: "${drv}/lib/pulseaudio/modules") # User-provided extra modules take precedence (overriddenModules ++ [ overriddenPackage ]); in lib.concatStringsSep ":" modulePaths; diff --git a/pkgs/servers/pulseaudio/0001-Make-gio-2.0-optional-15.patch b/pkgs/servers/pulseaudio/0001-Make-gio-2.0-optional-15.patch deleted file mode 100644 index c087dcd7e7d..00000000000 --- a/pkgs/servers/pulseaudio/0001-Make-gio-2.0-optional-15.patch +++ /dev/null @@ -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 - diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 760a0a5511b..5084bd72051 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # but use a conventional runtime sysconfdir outside the store ./add-option-for-installation-sysconfdir.patch # 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) ./0002-Ignore-SCM_CREDS-on-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 + 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" "$out/lib/pulseaudio/''$(basename ''$file .dylib).so" done ''; - passthru = { - pulseDir = - if (lib.versionAtLeast version "16.0") then - "lib/pulseaudio" - else - "lib/pulse-" + lib.versions.majorMinor version; - }; - meta = { description = "Sound server for POSIX and Win32 systems"; homepage = "http://www.pulseaudio.org/"; |