git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #117207 from doronbehar/pkg/gnomeExtensions/sound-output-device-chooser
commitc4697bc876d46fa27248d8f8d04cfb4ca2660d55 authorDoron Behar <doron.behar@gmail.com> dateWed 24 Mar 2021, 21:11 (6 years ago) parentede740da07fc25
2 files changed+12−11
compare with master
unifiedsplit
pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix+4−3 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch+8−8
pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix+4−3
@@ -7,16 +7,17 @@
77
88stdenv.mkDerivation rec {
99 pname = "gnome-shell-extension-sound-output-device-chooser";
10− version = "32";
10+ version = "35";
1111
1212 src = fetchFromGitHub {
1313 owner = "kgshank";
1414 repo = "gse-sound-output-device-chooser";
1515 rev = version;
16− sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l";
16+ sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs=";
1717 };
1818
1919 patches = [
20+ # Fix paths to libpulse and python
2021 (substituteAll {
2122 src = ./fix-paths.patch;
2223 libpulse = "${libpulseaudio}/lib/libpulse.so";
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
3637
3738 meta = with lib; {
3839 description = "GNOME Shell extension adding audio device chooser to panel";
39− license = licenses.gpl3;
40+ license = licenses.gpl3Plus;
4041 maintainers = with maintainers; [ jtojnar ];
4142 homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
4243 };
pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch+8−8
@@ -2,20 +2,20 @@ diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-outp
22index 54ad06f..0860531 100644
33--- a/sound-output-device-chooser@kgshank.net/convenience.js
44+++ b/sound-output-device-chooser@kgshank.net/convenience.js
5−@@ -129,7 +129,7 @@ function refreshCards() {
6− if(_settings.get_boolean(Prefs.NEW_PROFILE_ID)) {
5+@@ -142,7 +142,7 @@ function refreshCards() {
6+ if (newProfLogic) {
77 _log("New logic");
8− let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path();
9−- let pythonExec = 'python';
8+ let pyLocation = Me.dir.get_child("utils/pa_helper.py").get_path();
9+- let pythonExec = ["python", "python3", "python2"].find(cmd => isCmdFound(cmd));
1010+ let pythonExec = '@python@';
11− let pyVer = 3;
12− while(!isCmdFound(pythonExec) && pyVer >=2){
13− _log(pythonExec + " is not found. Try next");
11+ if (!pythonExec) {
12+ _log("ERROR: Python not found. fallback to default mode");
13+ _settings.set_boolean(Prefs.NEW_PROFILE_ID, false);
1414diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
1515index c4d2484..262608d 100644
1616--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
1717+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
18−@@ -86,7 +86,7 @@ else:
18+@@ -82,7 +82,7 @@ else:
1919
2020 _libraries = {}
2121