gnomeExtensions.easyScreenCast: 1.7.1 -> 1.9.0

Diff: https://github.com/EasyScreenCast/EasyScreenCast/compare/1.7.1...1.9.0

+44 -22
+2 -3
pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
··· 2 2 3 3 stdenv.mkDerivation (finalAttrs: { 4 4 pname = "gnome-shell-extension-EasyScreenCast"; 5 - version = "1.7.1"; 5 + version = "1.9.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "EasyScreenCast"; 9 9 repo = "EasyScreenCast"; 10 10 rev = finalAttrs.version; 11 - hash = "sha256-G7wdRFA0qL+6inVRLAmKoP0E0IOyvlmQIUwbDv/DbLI="; 11 + hash = "sha256-rRRMFAdWseTxW6W194TE3yNlnpPX7gLViLPLQW6zuSI="; 12 12 }; 13 13 14 14 patches = [ ··· 32 32 license = licenses.gpl3Plus; 33 33 maintainers = with maintainers; [ doronbehar ]; 34 34 platforms = platforms.linux; 35 - broken = true; 36 35 }; 37 36 })
+42 -19
pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch
··· 1 - diff --git a/prefs.js b/prefs.js 2 - index 97b85a3..2fc6539 100644 3 - --- a/prefs.js 4 - +++ b/prefs.js 5 - @@ -14,8 +14,8 @@ 1 + diff --git i/extension.js w/extension.js 2 + index c151057..1b6dfc3 100644 3 + --- i/extension.js 4 + +++ w/extension.js 5 + @@ -717,7 +717,7 @@ const EasyScreenCastIndicator = GObject.registerClass({ 6 + Lib.TalkativeLog('-*-execute post command'); 7 + 8 + // launch cmd after registration 9 + - const tmpCmd = `/usr/bin/sh -c "${this._settings.getOption('s', Settings.POST_CMD_SETTING_KEY)}"`; 10 + + const tmpCmd = `/bin/sh -c "${this._settings.getOption('s', Settings.POST_CMD_SETTING_KEY)}"`; 11 + 12 + const mapObj = { 13 + _fpath: pathFile, 14 + diff --git i/prefs.js w/prefs.js 15 + index e0dd1a2..9dcb87a 100644 16 + --- i/prefs.js 17 + +++ w/prefs.js 18 + @@ -13,8 +13,8 @@ 6 19 'use strict'; 7 20 8 - const GIRepository = imports.gi.GIRepository; 21 + import GIRepository from 'gi://GIRepository'; 9 22 -GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell'); 10 23 -GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell'); 11 24 +GIRepository.Repository.prepend_search_path('@gnomeShell@/lib/gnome-shell'); 12 25 +GIRepository.Repository.prepend_library_path('@gnomeShell@/lib/gnome-shell'); 13 26 14 - const GObject = imports.gi.GObject; 15 - const Gio = imports.gi.Gio; 16 - @@ -746,7 +746,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({ 27 + import Adw from 'gi://Adw'; 28 + import GObject from 'gi://GObject'; 29 + @@ -713,7 +713,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({ 17 30 Lib.TalkativeLog('-^-NOT SET xdg-user video'); 18 31 19 32 ctx.CtrlExe.Execute( ··· 22 35 true, 23 36 (success, out) => { 24 37 Lib.TalkativeLog(`-^-CALLBACK sync S: ${success} out: ${out}`); 25 - diff --git a/utilaudio.js b/utilaudio.js 26 - index 957eda2..84af241 100644 27 - --- a/utilaudio.js 28 - +++ b/utilaudio.js 29 - @@ -15,10 +15,7 @@ 38 + @@ -883,7 +883,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({ 39 + ); 30 40 31 - const GObject = imports.gi.GObject; 32 - const GIRepository = imports.gi.GIRepository; 41 + ctx.CtrlExe.Execute( 42 + - 'journalctl /usr/bin/gnome-shell --since "15 min ago" --output=cat --no-pager', 43 + + 'journalctl @gnomeShell@/bin/.gnome-shell-wrapped --since "15 min ago" --output=cat --no-pager', 44 + false, 45 + success => { 46 + Lib.TalkativeLog(`-^-CALLBACK async S= ${success}`); 47 + diff --git i/utilaudio.js w/utilaudio.js 48 + index b07e181..ed7d3ba 100644 49 + --- i/utilaudio.js 50 + +++ w/utilaudio.js 51 + @@ -14,10 +14,8 @@ 52 + 53 + import GObject from 'gi://GObject'; 54 + import GIRepository from 'gi://GIRepository'; 33 55 -GIRepository.Repository.prepend_search_path('/usr/lib/gnome-shell'); 34 56 -GIRepository.Repository.prepend_library_path('/usr/lib/gnome-shell'); 35 57 -GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell'); 36 58 -GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell'); 37 - +GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell"); 38 - const Gvc = imports.gi.Gvc; 59 + +GIRepository.Repository.prepend_search_path('@gnomeShell@/lib/gnome-shell'); 60 + +GIRepository.Repository.prepend_library_path('@gnomeShell@/lib/gnome-shell'); 61 + import Gvc from 'gi://Gvc'; 39 62 40 - const ExtensionUtils = imports.misc.extensionUtils; 63 + import * as Lib from './convenience.js';