Merge pull request #154692 from rhoriguchi/gnomeExtensions.volume-mixer

gnomeExtensions.volume-mixer: add override to fix extension
This commit is contained in:
piegames 2022-01-15 15:21:50 +01:00 committed by GitHub
commit 385d12ff26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 1 deletions

View File

@ -3,10 +3,13 @@
, gjs
, gnome
, gobject-introspection
, xprop
, pulseaudio
, python3
, substituteAll
, touchegg
, vte
, wrapGAppsHook
, xprop
}:
let
# Helper method to reduce redundancy
@ -62,6 +65,18 @@ super: lib.trivial.pipe super [
'';
}))
(patchExtension "shell-volume-mixer@derhofbauer.at" (old: {
patches = [
(substituteAll {
src = ./extensionOverridesPatches/shell-volume-mixer_at_derhofbauer.at.patch;
inherit pulseaudio;
inherit python3;
})
];
meta.maintainers = with lib.maintainers; [ rhoriguchi ];
}))
(patchExtension "unite@hardpixel.eu" (old: {
buildInputs = [ xprop ];

View File

@ -0,0 +1,32 @@
diff --git a/lib/utils/paHelper.js b/lib/utils/paHelper.js
index be28d21..a410a63 100755
--- a/lib/utils/paHelper.js
+++ b/lib/utils/paHelper.js
@@ -57,13 +57,7 @@ async function execHelper(type, index = undefined) {
return null;
}
- const python = await findPython();
-
- if (!python) {
- return null;
- }
-
- const args = ['/usr/bin/env', python, paUtilPath, type];
+ const args = ['@python3@/bin/python', paUtilPath, type];
if (!isNaN(index)) {
args.push(index);
diff --git a/pautils/lib/libpulse.py b/pautils/lib/libpulse.py
index a32c272..8225f2f 100755
--- a/pautils/lib/libpulse.py
+++ b/pautils/lib/libpulse.py
@@ -16,7 +16,7 @@
from ctypes import *
try:
- lib = CDLL('libpulse.so.0')
+ lib = CDLL('@pulseaudio@/lib/libpulse.so.0')
except:
lib = CDLL('libpulse.so')