uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,51 @@
|
|||
{ lib, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libpulseaudio
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-sound-output-device-chooser";
|
||||
# For gnome 42 support many commits not tagged yet are needed.
|
||||
version = "unstable-2022-03-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kgshank";
|
||||
repo = "gse-sound-output-device-chooser";
|
||||
rev = "76f7f59d23f5ffcd66555c7662f43c9cc1ce4742";
|
||||
sha256 = "sha256-iPc95LmDsYizLg45wpU+vFx/N6MR2hewSHqoRsePC/4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix paths to libpulse and python
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
libpulse = "${libpulseaudio}/lib/libpulse.so";
|
||||
python = python3.interpreter;
|
||||
})
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
passthru = {
|
||||
extensionUuid = "sound-output-device-chooser@kgshank.net";
|
||||
extensionPortalSlug = "sound-output-device-chooser";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p ${placeholder "out"}/share/gnome-shell/extensions
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNOME Shell extension adding audio device chooser to panel";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
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
|
||||
@@ -142,7 +142,7 @@ function refreshCards() {
|
||||
if (newProfLogic) {
|
||||
_log("New logic");
|
||||
let pyLocation = Me.dir.get_child("utils/pa_helper.py").get_path();
|
||||
- let pythonExec = ["python", "python3", "python2"].find(cmd => isCmdFound(cmd));
|
||||
+ let pythonExec = '@python@';
|
||||
if (!pythonExec) {
|
||||
_log("ERROR: Python not found. fallback to default mode");
|
||||
_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
|
||||
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
|
||||
@@ -82,7 +82,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!')
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue