From 86f2d455cb792cea24da7fe076c5a3cabc744eed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 17 Nov 2020 19:36:30 +0100 Subject: [PATCH] =?UTF-8?q?gnomeExtensions.sound-output-device-chooser:=20?= =?UTF-8?q?28=20=E2=86=92=2032?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/kgshank/gse-sound-output-device-chooser/compare/28...32 --- .../sound-output-device-chooser/default.nix | 4 ++-- .../fix-paths.patch | 20 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index 870ac448bb4e..9f80fbe28cd7 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "28"; + version = "32"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; rev = version; - sha256 = "1vmf8mgb52x7my3sidaw8kh26d5niadn18bgrl6bjcakmj5x8q16"; + sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch index a0a6551fcf81..5957cb956f7a 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch @@ -1,14 +1,18 @@ +diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-output-device-chooser@kgshank.net/convenience.js +index 54ad06f..0860531 100644 --- a/sound-output-device-chooser@kgshank.net/convenience.js +++ b/sound-output-device-chooser@kgshank.net/convenience.js -@@ -111,7 +111,7 @@ function refreshCards() { - log("New logic"); +@@ -129,7 +129,7 @@ function refreshCards() { + if(_settings.get_boolean(Prefs.NEW_PROFILE_ID)) { + _log("New logic"); let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path(); - try { -- let [result, out, err, exit_code] = GLib.spawn_command_line_sync('python ' + pyLocation); -+ let [result, out, err, exit_code] = GLib.spawn_command_line_sync('@python@ ' + pyLocation); - // log("result" + result +" out"+out + " exit_code" + exit_code + " - // err" +err); - if(result && !exit_code) { +- let pythonExec = 'python'; ++ let pythonExec = '@python@'; + let pyVer = 3; + while(!isCmdFound(pythonExec) && pyVer >=2){ + _log(pythonExec + " is not found. Try next"); +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 --- a/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: