gnomeExtensions.sound-output-device-chooser: 32 -> 35
Refresh paths patch.
This commit is contained in:
parent
e905e228ef
commit
a07fc25d56
|
@ -7,16 +7,17 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnome-shell-extension-sound-output-device-chooser";
|
pname = "gnome-shell-extension-sound-output-device-chooser";
|
||||||
version = "32";
|
version = "35";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kgshank";
|
owner = "kgshank";
|
||||||
repo = "gse-sound-output-device-chooser";
|
repo = "gse-sound-output-device-chooser";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l";
|
sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
# Fix paths to libpulse and python
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./fix-paths.patch;
|
src = ./fix-paths.patch;
|
||||||
libpulse = "${libpulseaudio}/lib/libpulse.so";
|
libpulse = "${libpulseaudio}/lib/libpulse.so";
|
||||||
|
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "GNOME Shell extension adding audio device chooser to panel";
|
description = "GNOME Shell extension adding audio device chooser to panel";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ jtojnar ];
|
||||||
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
|
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,20 +2,20 @@ diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-outp
|
||||||
index 54ad06f..0860531 100644
|
index 54ad06f..0860531 100644
|
||||||
--- a/sound-output-device-chooser@kgshank.net/convenience.js
|
--- a/sound-output-device-chooser@kgshank.net/convenience.js
|
||||||
+++ b/sound-output-device-chooser@kgshank.net/convenience.js
|
+++ b/sound-output-device-chooser@kgshank.net/convenience.js
|
||||||
@@ -129,7 +129,7 @@ function refreshCards() {
|
@@ -142,7 +142,7 @@ function refreshCards() {
|
||||||
if(_settings.get_boolean(Prefs.NEW_PROFILE_ID)) {
|
if (newProfLogic) {
|
||||||
_log("New logic");
|
_log("New logic");
|
||||||
let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path();
|
let pyLocation = Me.dir.get_child("utils/pa_helper.py").get_path();
|
||||||
- let pythonExec = 'python';
|
- let pythonExec = ["python", "python3", "python2"].find(cmd => isCmdFound(cmd));
|
||||||
+ let pythonExec = '@python@';
|
+ let pythonExec = '@python@';
|
||||||
let pyVer = 3;
|
if (!pythonExec) {
|
||||||
while(!isCmdFound(pythonExec) && pyVer >=2){
|
_log("ERROR: Python not found. fallback to default mode");
|
||||||
_log(pythonExec + " is not found. Try next");
|
_settings.set_boolean(Prefs.NEW_PROFILE_ID, false);
|
||||||
diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
|
diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
|
||||||
index c4d2484..262608d 100644
|
index c4d2484..262608d 100644
|
||||||
--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
|
--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
|
||||||
+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
|
+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
|
||||||
@@ -86,7 +86,7 @@ else:
|
@@ -82,7 +82,7 @@ else:
|
||||||
|
|
||||||
_libraries = {}
|
_libraries = {}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue