Merge pull request #81779 from r-ryantm/auto-update/gnome-shell-extension-sound-output-device-chooser

gnomeExtensions.sound-output-device-chooser: 24 -> 25
This commit is contained in:
Jan Tojnar 2020-03-05 11:46:02 +01:00 committed by GitHub
commit c4f21fdafc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 4 deletions

View file

@ -1,16 +1,29 @@
{ stdenv, fetchFromGitHub }:
{ stdenv
, substituteAll
, fetchFromGitHub
, libpulseaudio
, python3
}:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-sound-output-device-chooser";
version = "24";
version = "25";
src = fetchFromGitHub {
owner = "kgshank";
repo = "gse-sound-output-device-chooser";
rev = version;
sha256 = "0n1rf4pdf0b78ivmz89x223sqlzv30qydkvlnvn7hwx0j32kyr0x";
sha256 = "16xaa4r01575ix9lrvww8n6pird8r3ml1j037b3sm6dfrf8kvzxs";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
libpulse = "${libpulseaudio}/lib/libpulse.so";
python = python3.interpreter;
})
];
dontBuild = true;
uuid = "sound-output-device-chooser@kgshank.net";
@ -23,6 +36,6 @@ stdenv.mkDerivation rec {
description = "GNOME Shell extension adding audio device chooser to panel";
license = licenses.gpl3;
maintainers = with maintainers; [ jtojnar ];
homepage = https://github.com/kgshank/gse-sound-output-device-chooser;
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
};
}

View file

@ -0,0 +1,22 @@
--- 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");
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) {
--- 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:
_libraries = {}
-libpulse_library_name = find_library('pulse')
+libpulse_library_name = '@libpulse@'
if libpulse_library_name is None:
raise Exception('No libpulse.so library found!')